From 23124b761018cac81ee694864f4be6373b841529 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Fri, 27 Jun 2014 09:58:03 +0200 Subject: 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 --- parameter/Android.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'parameter/Android.mk') 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) ############################## -- cgit v1.1