diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:11 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:11 +0000 |
commit | e4b7614422621dbf83825717f5fe06b21a53fd3d (patch) | |
tree | 701d167161f14f3dba1f0111999ba4d7115f9873 /libjingle/xmllite | |
parent | c34187f7b7dd48bd316bebad20b05a4a8fd4503b (diff) | |
download | webrtc-e4b7614422621dbf83825717f5fe06b21a53fd3d.tar.gz |
Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: Ib4f1a99ca57b985be94ad5094d09418dc048e66a
Diffstat (limited to 'libjingle/xmllite')
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.linux-arm.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.linux-mips.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.linux-x86.mk | 17 | ||||
-rw-r--r-- | libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk | 17 |
10 files changed, 40 insertions, 130 deletions
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk index 332e02b8..519e1882 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -133,10 +134,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -281,13 +276,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk index fa2a0a0c..def5ef58 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -119,10 +120,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -251,13 +246,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk index 36a81041..8b655517 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -125,10 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -265,13 +260,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk index 69f575bf..73edae32 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -125,10 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -238,10 +236,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -263,13 +258,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk index ee43a2aa..9768251a 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -124,10 +125,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -261,13 +256,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk index 332e02b8..519e1882 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -133,10 +134,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -281,13 +276,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk index fa2a0a0c..def5ef58 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -119,10 +120,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -251,13 +246,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk index 36a81041..8b655517 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -125,10 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -265,13 +260,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk index 69f575bf..73edae32 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -125,10 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -238,10 +236,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -263,13 +258,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk index ee43a2aa..9768251a 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_libjingle_xmllite_rtc_xmllite_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -124,10 +125,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/expat/files/lib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/expat/files/lib # Flags passed to only C++ (and not C) files. @@ -261,13 +256,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |