Revert "Revert "Replacing copy headers with header libraries""
This reverts commit 36603418913490429377664543c3fd2dc2b18a30.
Test: build sailfish
Change-Id: Ie3d667f881b1b8402d24c04f49c406dc980cc39b
diff --git a/dataservices/rmnetctl/src/Android.mk b/dataservices/rmnetctl/src/Android.mk
index 56efefe..6be3d74 100644
--- a/dataservices/rmnetctl/src/Android.mk
+++ b/dataservices/rmnetctl/src/Android.mk
@@ -1,13 +1,15 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := dataservices/rmnetctl
-LOCAL_COPY_HEADERS := ../inc/librmnetctl.h
+LOCAL_MODULE := librmnetctl_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)/inc
+include $(BUILD_HEADER_LIBRARY)
+include $(CLEAR_VARS)
LOCAL_SRC_FILES := librmnetctl.c
LOCAL_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
LOCAL_C_INCLUDES += $(LOCAL_PATH)
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
diff --git a/dataservices/rmnetctl/src/inc b/dataservices/rmnetctl/src/inc
new file mode 120000
index 0000000..456aecc
--- /dev/null
+++ b/dataservices/rmnetctl/src/inc
@@ -0,0 +1 @@
+../inc/
\ No newline at end of file
diff --git a/recovery/gpt-utils/Android.mk b/recovery/gpt-utils/Android.mk
index 8ef53f9..b37a50c 100644
--- a/recovery/gpt-utils/Android.mk
+++ b/recovery/gpt-utils/Android.mk
@@ -36,9 +36,13 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_SHARED_LIBRARIES += liblog libsparse libcutils
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libgptutils_headers
LOCAL_MODULE := libgptutils
LOCAL_MODULE_OWNER := qti
LOCAL_PROPRIETARY_MODULE := true
-LOCAL_COPY_HEADERS_TO := gpt-utils/inc
-LOCAL_COPY_HEADERS := gpt-utils.h
include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libgptutils_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
+include $(BUILD_HEADER_LIBRARY)
diff --git a/thermal-engine/Android.mk b/thermal-engine/Android.mk
index ec228c4..bcb5423 100644
--- a/thermal-engine/Android.mk
+++ b/thermal-engine/Android.mk
@@ -2,7 +2,8 @@
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := thermal-engine
-LOCAL_COPY_HEADERS := ./thermal_client.h
+LOCAL_MODULE:=thermal-engine
-include $(BUILD_COPY_HEADERS)
+LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
+
+include $(BUILD_HEADER_LIBRARY)
diff --git a/time-services/Android.mk b/time-services/Android.mk
index d3df3f6..5d6257c 100644
--- a/time-services/Android.mk
+++ b/time-services/Android.mk
@@ -7,7 +7,8 @@
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := time-services
-LOCAL_COPY_HEADERS := ./time_genoff.h
+LOCAL_MODULE:=time-services
-include $(BUILD_COPY_HEADERS)
+LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
+
+include $(BUILD_HEADER_LIBRARY)
