summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-23 18:07:52 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-23 18:13:53 +0200
commit93f402c37a314a83b877cd95e1a2c464bf26d8e2 (patch)
treeb37a0083afc5ae40a9681738da3aa69b1965d3d9 /parameter
parentfb474cce72215e432308264ada9c5a7197a21125 (diff)
downloadexternal_parameter-framework-93f402c37a314a83b877cd95e1a2c464bf26d8e2.zip
external_parameter-framework-93f402c37a314a83b877cd95e1a2c464bf26d8e2.tar.gz
external_parameter-framework-93f402c37a314a83b877cd95e1a2c464bf26d8e2.tar.bz2
Revert "Android.mk: Remove the libparameter_includes hack"
This reverts commit 34e90ae1c744e1de6547e014326ef54f516439c8. libparameter_includes and libparameter_includes_host are used to build the parameter-framework plugins. They were removed by error. We need to revert this patch since we still use those make targets. Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'parameter')
-rwxr-xr-xparameter/Android.mk33
1 files changed, 33 insertions, 0 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 9541936..dd0c71d 100755
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -194,3 +194,36 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host $(common_sta
LOCAL_LDLIBS += -ldl
include $(BUILD_HOST_SHARED_LIBRARY)
+
+################################
+# Export includes for plugins (Target build)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := $(common_module)_includes
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
+LOCAL_STATIC_LIBRARIES := \
+ libxmlserializer \
+ libpfw_utility \
+ $(common_static_libraries)
+
+include $(BUILD_STATIC_LIBRARY)
+
+################################
+# Export includes for plugins (Host build)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := $(common_module)_includes_host
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
+LOCAL_STATIC_LIBRARIES := \
+ libxmlserializer_host \
+ libpfw_utility_host \
+ $(common_static_libraries)
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+