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 /system_wrappers | |
| 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 'system_wrappers')
20 files changed, 80 insertions, 260 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index de6f7e92..c9252f8b 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -120,10 +121,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -268,13 +263,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk index c4cd468d..167bbcf8 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -106,10 +107,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -207,10 +205,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -238,13 +233,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk index 1bc61157..4339955e 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -112,10 +113,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -252,13 +247,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk index d6108435..63bb1785 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -112,10 +113,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -250,13 +245,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk index a5b33327..9aba1e61 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -111,10 +112,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -217,10 +215,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -248,13 +243,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index de6f7e92..c9252f8b 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -120,10 +121,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -268,13 +263,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.linux-arm64.mk b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk index c4cd468d..167bbcf8 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -106,10 +107,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -207,10 +205,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -238,13 +233,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index 1bc61157..4339955e 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -112,10 +113,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -252,13 +247,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index d6108435..63bb1785 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -112,10 +113,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -250,13 +245,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk index a5b33327..9aba1e61 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_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)) @@ -111,10 +112,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -217,10 +215,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ - $(LOCAL_PATH)/third_party \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party # Flags passed to only C++ (and not C) files. @@ -248,13 +243,9 @@ LOCAL_STATIC_LIBRARIES := \ # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true - -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/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index 954f711f..56ab0f33 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -153,10 +154,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -273,10 +271,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -299,13 +294,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/system_wrappers/source/system_wrappers.target.darwin-arm64.mk b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk index f257dfe7..18a646b8 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -139,10 +140,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -244,10 +242,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -269,13 +264,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/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index a7a79f27..a9506fbf 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -145,10 +146,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -257,10 +255,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -283,13 +278,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/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index d83ef506..0dcd71ab 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -145,10 +146,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -256,10 +254,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # 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/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk index 97962c36..c7e3862c 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -144,10 +145,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -254,10 +252,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -279,13 +274,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/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index 954f711f..56ab0f33 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -153,10 +154,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -273,10 +271,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -299,13 +294,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/system_wrappers/source/system_wrappers.target.linux-arm64.mk b/system_wrappers/source/system_wrappers.target.linux-arm64.mk index f257dfe7..18a646b8 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -139,10 +140,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -244,10 +242,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -269,13 +264,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/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index a7a79f27..a9506fbf 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -145,10 +146,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -257,10 +255,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -283,13 +278,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/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index d83ef506..0dcd71ab 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -145,10 +146,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -256,10 +254,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # 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/system_wrappers/source/system_wrappers.target.linux-x86_64.mk b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk index 97962c36..c7e3862c 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_system_wrappers_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)) @@ -144,10 +145,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -254,10 +252,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/spreadsortlib \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface # Flags passed to only C++ (and not C) files. @@ -279,13 +274,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 |