summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/memtrack/memtrack.h (renamed from libmemtrack/include/memtrack.h)9
-rw-r--r--libmemtrack/Android.mk3
-rw-r--r--libmemtrack/memtrack.c2
-rw-r--r--libmemtrack/memtrack_test.c2
4 files changed, 12 insertions, 4 deletions
diff --git a/libmemtrack/include/memtrack.h b/include/memtrack/memtrack.h
index d6b370b22..0f1f85e22 100644
--- a/libmemtrack/include/memtrack.h
+++ b/include/memtrack/memtrack.h
@@ -19,6 +19,11 @@
#include <sys/types.h>
#include <stddef.h>
+#include <cutils/compiler.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/**
* struct memtrack_proc
@@ -135,4 +140,8 @@ ssize_t memtrack_proc_other_total(struct memtrack_proc *p);
*/
ssize_t memtrack_proc_other_pss(struct memtrack_proc *p);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index c23b6f410..a8fb3eb00 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -3,10 +3,9 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := memtrack.c
LOCAL_MODULE := libmemtrack
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include hardware/libhardware/include
+LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_SHARED_LIBRARIES := libhardware liblog
LOCAL_CFLAGS := -Wall -Werror
include $(BUILD_SHARED_LIBRARY)
diff --git a/libmemtrack/memtrack.c b/libmemtrack/memtrack.c
index 2b2651a28..9a656dfd3 100644
--- a/libmemtrack/memtrack.c
+++ b/libmemtrack/memtrack.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <memtrack.h>
+#include <memtrack/memtrack.h>
#define LOG_TAG "memtrack"
diff --git a/libmemtrack/memtrack_test.c b/libmemtrack/memtrack_test.c
index f306f67f1..cd94bc5e1 100644
--- a/libmemtrack/memtrack_test.c
+++ b/libmemtrack/memtrack_test.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <sys/types.h>
-#include <memtrack.h>
+#include <memtrack/memtrack.h>
#include <pagemap/pagemap.h>