diff options
| -rw-r--r-- | parameter/Android.mk | 8 | ||||
| -rw-r--r-- | remote-process/Android.mk | 8 | ||||
| -rw-r--r-- | remote-processor/Android.mk | 7 | ||||
| -rw-r--r-- | test/test-platform/Android.mk | 8 | ||||
| -rw-r--r-- | utility/Android.mk | 5 | ||||
| -rw-r--r-- | xmlserializer/Android.mk | 8 |
6 files changed, 14 insertions, 30 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) ############################## diff --git a/remote-process/Android.mk b/remote-process/Android.mk index a269249..732f579 100644 --- a/remote-process/Android.mk +++ b/remote-process/Android.mk @@ -61,15 +61,13 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) -LOCAL_C_INCLUDES += \ - $(common_c_includes) \ - external/stlport/stlport \ - bionic/ +LOCAL_C_INCLUDES := $(common_c_includes) -LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport +LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries) +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) ############################## diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk index c0c5257..913f037 100644 --- a/remote-processor/Android.mk +++ b/remote-processor/Android.mk @@ -63,14 +63,9 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) -LOCAL_C_INCLUDES += \ - external/stlport/stlport \ - bionic/ - -LOCAL_SHARED_LIBRARIES := libstlport - LOCAL_LDLIBS += $(common_ldlibs) +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) ############################## diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index 139a722..a0ad8ba 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -54,14 +54,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_STATIC_LIBRARIES := libpfw_utility -LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport +LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) ############################## diff --git a/utility/Android.mk b/utility/Android.mk index 74f2e76..a224fe7 100644 --- a/utility/Android.mk +++ b/utility/Android.mk @@ -59,10 +59,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) -LOCAL_C_INCLUDES += \ - external/stlport/stlport \ - bionic - +include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) ############################## diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index 8dca27f..e6b06c1 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -72,16 +72,14 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) -LOCAL_C_INCLUDES += \ - $(common_c_includes) \ - external/stlport/stlport \ - bionic/ +LOCAL_C_INCLUDES := $(common_c_includes) -LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport +LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) ############################## |