Revert "Replacing copy headers with header libraries"
This reverts commit f7830197e1de4e06c35586ece28e8924e5b2389b.
Change-Id: I41127517a91520c82d85d3c7a1b4a9c2f540b8ae
diff --git a/dataservices/rmnetctl/src/Android.mk b/dataservices/rmnetctl/src/Android.mk
index 6be3d74..56efefe 100644
--- a/dataservices/rmnetctl/src/Android.mk
+++ b/dataservices/rmnetctl/src/Android.mk
@@ -1,15 +1,13 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := librmnetctl_headers
-LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)/inc
-include $(BUILD_HEADER_LIBRARY)
+LOCAL_COPY_HEADERS_TO := dataservices/rmnetctl
+LOCAL_COPY_HEADERS := ../inc/librmnetctl.h
-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
deleted file mode 120000
index 456aecc..0000000
--- a/dataservices/rmnetctl/src/inc
+++ /dev/null
@@ -1 +0,0 @@
-../inc/
\ No newline at end of file
diff --git a/recovery/gpt-utils/Android.mk b/recovery/gpt-utils/Android.mk
index b37a50c..8ef53f9 100644
--- a/recovery/gpt-utils/Android.mk
+++ b/recovery/gpt-utils/Android.mk
@@ -36,13 +36,9 @@
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 bcb5423..ec228c4 100644
--- a/thermal-engine/Android.mk
+++ b/thermal-engine/Android.mk
@@ -2,8 +2,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE:=thermal-engine
+LOCAL_COPY_HEADERS_TO := thermal-engine
+LOCAL_COPY_HEADERS := ./thermal_client.h
-LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
-
-include $(BUILD_HEADER_LIBRARY)
+include $(BUILD_COPY_HEADERS)
diff --git a/time-services/Android.mk b/time-services/Android.mk
index 5d6257c..d3df3f6 100644
--- a/time-services/Android.mk
+++ b/time-services/Android.mk
@@ -7,8 +7,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE:=time-services
+LOCAL_COPY_HEADERS_TO := time-services
+LOCAL_COPY_HEADERS := ./time_genoff.h
-LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
-
-include $(BUILD_HEADER_LIBRARY)
+include $(BUILD_COPY_HEADERS)
