Merge "Remove the hack for including libpagemap's headers."

Author: enh-google

ksmutils/Android.mk

@@ -13,18 +13,11 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ksminfo.c lookup3.c
-
-LOCAL_C_INCLUDES := $(call include-path-for, libpagemap)
-
 LOCAL_SHARED_LIBRARIES := libpagemap
-
 LOCAL_MODULE := ksminfo
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
 LOCAL_MODULE_TAGS := debug
-
 include $(BUILD_EXECUTABLE)

librank/Android.mk

@@ -13,18 +13,11 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := librank.c
-
-LOCAL_C_INCLUDES := $(call include-path-for, libpagemap)
-
 LOCAL_SHARED_LIBRARIES := libpagemap
-
 LOCAL_MODULE := librank
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
 LOCAL_MODULE_TAGS := debug
-
 include $(BUILD_EXECUTABLE)

procmem/Android.mk

@@ -13,18 +13,11 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := procmem.c
-
-LOCAL_C_INCLUDES := $(call include-path-for, libpagemap)
-
 LOCAL_SHARED_LIBRARIES := libpagemap
-
 LOCAL_MODULE := procmem
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
 LOCAL_MODULE_TAGS := debug
-
 include $(BUILD_EXECUTABLE)

procrank/Android.mk

@@ -13,20 +13,12 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := procrank.c
-
-LOCAL_C_INCLUDES := $(call include-path-for, libpagemap)
-
 LOCAL_CFLAGS := -Wall -Wextra -Wformat=2 -Werror
-
 LOCAL_SHARED_LIBRARIES := libpagemap
-
 LOCAL_MODULE := procrank
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
 LOCAL_MODULE_TAGS := debug
-
 include $(BUILD_EXECUTABLE)