summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-27 09:58:03 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-30 08:45:40 +0200
commit23124b761018cac81ee694864f4be6373b841529 (patch)
treef04c5ba6a3eee4660897114b7aa525dd53a3a0c8 /parameter
parent133d7cb1b373bb05201e8e26d0e456c1e98ef198 (diff)
downloadexternal_parameter-framework-23124b761018cac81ee694864f4be6373b841529.zip
external_parameter-framework-23124b761018cac81ee694864f4be6373b841529.tar.gz
external_parameter-framework-23124b761018cac81ee694864f4be6373b841529.tar.bz2
Fix stlport includes in makefiles
BZ: 207083 According to libstlport.mk, to use stlport for a given target, we shall "include external/stlport/libstlport.mk" in the target. This was not done in the parameter-framework's makefiles. This patch change all targets which require stlport to include it in the correct way. Change-Id: Ie9b75af6269f172ad6a6c753e15efd0c7baafdd9 Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'parameter')
-rw-r--r--parameter/Android.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 04e201c..145bb0c 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -159,14 +159,12 @@ LOCAL_SRC_FILES := $(common_src_files)
LOCAL_MODULE := $(common_module)
LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_C_INCLUDES += \
- $(common_c_includes) \
- external/stlport/stlport \
- bionic/
+LOCAL_C_INCLUDES := $(common_c_includes)
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl
LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
+include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
##############################