summaryrefslogtreecommitdiffstats
path: root/libmemtrack
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-07-12 22:10:56 -0700
committerDan Willemsen <dwillemsen@google.com>2016-07-13 17:41:45 -0700
commit45f05240c2d9d1f3903e2766b4883e256288f6c2 (patch)
treeee0405336f534c9b00448860c3df845452e43223 /libmemtrack
parentdc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff)
downloadsystem_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.gz
system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.bz2
system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.zip
Convert more Android.mk files to Android.bp
These modules have their dependencies satisfied, and aren't doing anything strange. Change-Id: I72039a15256cbd5e5eee0d79a15d66d74a6c087d
Diffstat (limited to 'libmemtrack')
-rw-r--r--libmemtrack/Android.bp30
-rw-r--r--libmemtrack/Android.mk20
2 files changed, 30 insertions, 20 deletions
diff --git a/libmemtrack/Android.bp b/libmemtrack/Android.bp
new file mode 100644
index 000000000..98413ddcc
--- /dev/null
+++ b/libmemtrack/Android.bp
@@ -0,0 +1,30 @@
+// Copyright 2013 The Android Open Source Project
+
+cc_library_shared {
+ name: "libmemtrack",
+ srcs: ["memtrack.c"],
+ export_include_dirs: ["include"],
+ local_include_dirs: ["include"],
+ include_dirs: ["hardware/libhardware/include"],
+ shared_libs: [
+ "libhardware",
+ "liblog",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
+cc_binary {
+ name: "memtrack_test",
+ srcs: ["memtrack_test.c"],
+ shared_libs: [
+ "libmemtrack",
+ "libpagemap",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
deleted file mode 100644
index ffc7244d3..000000000
--- a/libmemtrack/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2013 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := memtrack.c
-LOCAL_MODULE := libmemtrack
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES += hardware/libhardware/include
-LOCAL_SHARED_LIBRARIES := libhardware liblog
-LOCAL_CFLAGS := -Wall -Werror
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := memtrack_test.c
-LOCAL_MODULE := memtrack_test
-LOCAL_SHARED_LIBRARIES := libmemtrack libpagemap
-LOCAL_CFLAGS := -Wall -Werror
-include $(BUILD_EXECUTABLE)