diff options
| author | Zhengyin Qian <qianzy@google.com> | 2015-08-19 15:31:06 -0700 |
|---|---|---|
| committer | Zhengyin Qian <qianzy@google.com> | 2015-08-19 15:31:06 -0700 |
| commit | 771d851381eebcf3a47a368b6a307aa5d4121ea8 (patch) | |
| tree | 1eeae3888d61720a9d7869d3f9d5ad4ef04c89c7 | |
| parent | 7f346c9058f39a533a2eaadc9ebc4001397c6ff9 (diff) | |
| parent | 531c26be6445110360042f1c94952fbcb76d4971 (diff) | |
| download | parameter-framework-android-6.0.1_r53.tar.gz | |
resolved conflicts for merge of 531c26be to cw-e-devandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-dev
Change-Id: I02a7a956d2423f86bc790473687b80bb3132f6dc
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | parameter/Android.mk | 4 | ||||
| -rw-r--r-- | remote-process/Android.mk | 4 | ||||
| -rw-r--r-- | remote-processor/Android.mk | 4 | ||||
| -rw-r--r-- | test/test-platform/Android.mk | 4 | ||||
| -rw-r--r-- | utility/Android.mk | 4 | ||||
| -rw-r--r-- | xmlserializer/Android.mk | 4 |
7 files changed, 37 insertions, 0 deletions
@@ -1,3 +1,16 @@ +# For Android L MR1 and lower, need to include libstlport +# For M, this is not needed +MAJOR_VERSION := $(shell echo $(PLATFORM_VERSION) | cut -f1 -d.) +MINOR_VERSION := $(shell echo $(PLATFORM_VERSION) | cut -f2 -d.) + +ifeq ($(shell test $(MAJOR_VERSION) -le 4 && echo 1), 1) +INCLUDE_STLPORT:=true +else ifeq ($(shell test $(MAJOR_VERSION) -eq 5 -a $(MINOR_VERSION) -le 1 && echo 1), 1) +INCLUDE_STLPORT:=true +else +INCLUDE_STLPORT:=false +endif + # Recursive call sub-folder Android.mk # ifeq ($(HOST_OS),linux) diff --git a/parameter/Android.mk b/parameter/Android.mk index 2f4b483..7fa83fc 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -158,6 +158,10 @@ LOCAL_STATIC_LIBRARIES := libpfw_utility LOCAL_REQUIRED_MODULES := libremote-processor +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_SHARED_LIBRARY) ############################## diff --git a/remote-process/Android.mk b/remote-process/Android.mk index 015c8ec..a29b834 100644 --- a/remote-process/Android.mk +++ b/remote-process/Android.mk @@ -67,6 +67,10 @@ LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries) +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_EXECUTABLE) ############################## diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk index 784a917..124eb71 100644 --- a/remote-processor/Android.mk +++ b/remote-processor/Android.mk @@ -65,6 +65,10 @@ LOCAL_MODULE := $(common_module) LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_SHARED_LIBRARY) ############################## diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index 04b1b90..eca285a 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -60,6 +60,10 @@ LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_STATIC_LIBRARIES := libpfw_utility LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_EXECUTABLE) ############################## diff --git a/utility/Android.mk b/utility/Android.mk index 168c423..acafaef 100644 --- a/utility/Android.mk +++ b/utility/Android.mk @@ -61,6 +61,10 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_STATIC_LIBRARY) ############################## diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index 67b9bf7..2c66caf 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -78,6 +78,10 @@ LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +ifeq ($(INCLUDE_STLPORT), true) + include external/stlport/libstlport.mk +endif + include $(BUILD_SHARED_LIBRARY) ############################## |