From e2b4e1e00cc5263ca7c0adbe8f8418f5c98ea5fe Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 12 Feb 2016 18:07:29 -0800 Subject: [PATCH] Move libnativeloader headers into libnativeloader. Change-Id: I227676276da1b08a84486f29fb0e1502c8dbdf4a --- libnativeloader/Android.mk | 9 ++++++--- .../include}/nativeloader/native_loader.h | 0 2 files changed, 6 insertions(+), 3 deletions(-) rename {include => libnativeloader/include}/nativeloader/native_loader.h (100%) diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk index 5e65c4c3e..6c064c706 100644 --- a/libnativeloader/Android.mk +++ b/libnativeloader/Android.mk @@ -17,7 +17,8 @@ LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both - +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include include $(BUILD_SHARED_LIBRARY) # Shared library for host @@ -34,7 +35,8 @@ LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both - +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include include $(BUILD_HOST_SHARED_LIBRARY) # Static library for host @@ -50,5 +52,6 @@ LOCAL_CFLAGS += -Werror -Wall LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both - +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/include/nativeloader/native_loader.h b/libnativeloader/include/nativeloader/native_loader.h similarity index 100% rename from include/nativeloader/native_loader.h rename to libnativeloader/include/nativeloader/native_loader.h