ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Moves libmemtrack header to standard location" into klp-dev

Browse source
This commit is contained in:
Adam Lesinski 2013-09-26 17:22:15 +00:00 • committed by Android (Google) Code Review
commit bbe4c49b4e
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libmemtrack/include/memtrack.h → include/memtrack/memtrack.h
View file

@ -19,6 +19,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
#include <cutils/compiler.h>
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* struct memtrack_proc * 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); ssize_t memtrack_proc_other_pss(struct memtrack_proc *p);
#ifdef __cplusplus
}
#endif
#endif #endif

3
libmemtrack/Android.mk
View file

@ -3,10 +3,9 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := memtrack.c LOCAL_SRC_FILES := memtrack.c
LOCAL_MODULE := libmemtrack LOCAL_MODULE := libmemtrack
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include hardware/libhardware/include LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_SHARED_LIBRARIES := libhardware liblog LOCAL_SHARED_LIBRARIES := libhardware liblog
LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS := -Wall -Werror
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
libmemtrack/memtrack.c
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <memtrack.h> #include <memtrack/memtrack.h>
#define LOG_TAG "memtrack" #define LOG_TAG "memtrack"

2
libmemtrack/memtrack_test.c
View file

@ -19,7 +19,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <memtrack.h> #include <memtrack/memtrack.h>
#include <pagemap/pagemap.h> #include <pagemap/pagemap.h>