diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2013-09-26 10:27:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-26 10:27:55 -0700 |
| commit | 71ddce59275e70c34015b0fa87c10384ab1876cd (patch) | |
| tree | 92cebb88c3feb23b1d2b627aaa19e7707feb3a02 | |
| parent | 8f4c14f1e7fd0a2f9b46151ccc83c49b41e830ef (diff) | |
| parent | bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810 (diff) | |
| download | system_core-71ddce59275e70c34015b0fa87c10384ab1876cd.zip system_core-71ddce59275e70c34015b0fa87c10384ab1876cd.tar.gz system_core-71ddce59275e70c34015b0fa87c10384ab1876cd.tar.bz2 | |
am bbe4c49b: Merge "Moves libmemtrack header to standard location" into klp-dev
* commit 'bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810':
Moves libmemtrack header to standard location
| -rw-r--r-- | include/memtrack/memtrack.h (renamed from libmemtrack/include/memtrack.h) | 9 | ||||
| -rw-r--r-- | libmemtrack/Android.mk | 3 | ||||
| -rw-r--r-- | libmemtrack/memtrack.c | 2 | ||||
| -rw-r--r-- | libmemtrack/memtrack_test.c | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/libmemtrack/include/memtrack.h b/include/memtrack/memtrack.h index d6b370b..0f1f85e 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 c23b6f4..a8fb3eb 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 2b2651a..9a656df 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 f306f67..cd94bc5 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> |