Remove the hack for including libpagemap's headers.
Change-Id: If75e007111f82178e372c88ab4dce62fd8ff7873
diff --git a/ksmutils/Android.mk b/ksmutils/Android.mk
index f34576d..b7825c4 100644
--- a/ksmutils/Android.mk
+++ b/ksmutils/Android.mk
@@ -13,18 +13,11 @@
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
+
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)
diff --git a/librank/Android.mk b/librank/Android.mk
index 300b3f5..101b94a 100644
--- a/librank/Android.mk
+++ b/librank/Android.mk
@@ -13,18 +13,11 @@
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
+
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)
diff --git a/procmem/Android.mk b/procmem/Android.mk
index ffd5660..b7fba56 100644
--- a/procmem/Android.mk
+++ b/procmem/Android.mk
@@ -13,18 +13,11 @@
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
+
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)
diff --git a/procrank/Android.mk b/procrank/Android.mk
index be7c599..f1eb3b6 100644
--- a/procrank/Android.mk
+++ b/procrank/Android.mk
@@ -13,20 +13,12 @@
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
+
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)