Merge "Moves libmemtrack header to standard location" into klp-dev (bbe4c49b) · Commits · e / os / android_system_core

libmemtrack/include/memtrack.h→include/memtrack/memtrack.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include <memtrack.h>
		#include <memtrack/memtrack.h>

		#define LOG_TAG "memtrack"

+1 −1