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 | |
| 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
454 files changed, 1796 insertions, 5752 deletions
diff --git a/base/rtc_base.target.darwin-arm.mk b/base/rtc_base.target.darwin-arm.mk index 65dda2df..232c57db 100644 --- a/base/rtc_base.target.darwin-arm.mk +++ b/base/rtc_base.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -192,10 +193,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -316,10 +314,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -342,13 +337,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/base/rtc_base.target.darwin-arm64.mk b/base/rtc_base.target.darwin-arm64.mk index 006a2fcf..a50080d8 100644 --- a/base/rtc_base.target.darwin-arm64.mk +++ b/base/rtc_base.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -178,10 +179,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -287,10 +285,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -312,13 +307,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/base/rtc_base.target.darwin-mips.mk b/base/rtc_base.target.darwin-mips.mk index 6cc43afb..8594aeaf 100644 --- a/base/rtc_base.target.darwin-mips.mk +++ b/base/rtc_base.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -184,10 +185,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -300,10 +298,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -326,13 +321,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/base/rtc_base.target.darwin-x86.mk b/base/rtc_base.target.darwin-x86.mk index 63370314..fd2a73b4 100644 --- a/base/rtc_base.target.darwin-x86.mk +++ b/base/rtc_base.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -184,10 +185,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -299,10 +297,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -324,13 +319,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/base/rtc_base.target.darwin-x86_64.mk b/base/rtc_base.target.darwin-x86_64.mk index ac93c9bf..6440af94 100644 --- a/base/rtc_base.target.darwin-x86_64.mk +++ b/base/rtc_base.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -183,10 +184,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -322,13 +317,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/base/rtc_base.target.linux-arm.mk b/base/rtc_base.target.linux-arm.mk index 65dda2df..232c57db 100644 --- a/base/rtc_base.target.linux-arm.mk +++ b/base/rtc_base.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -192,10 +193,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -316,10 +314,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -342,13 +337,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/base/rtc_base.target.linux-arm64.mk b/base/rtc_base.target.linux-arm64.mk index 006a2fcf..a50080d8 100644 --- a/base/rtc_base.target.linux-arm64.mk +++ b/base/rtc_base.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -178,10 +179,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -287,10 +285,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -312,13 +307,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/base/rtc_base.target.linux-mips.mk b/base/rtc_base.target.linux-mips.mk index 6cc43afb..8594aeaf 100644 --- a/base/rtc_base.target.linux-mips.mk +++ b/base/rtc_base.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -184,10 +185,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -300,10 +298,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -326,13 +321,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/base/rtc_base.target.linux-x86.mk b/base/rtc_base.target.linux-x86.mk index 63370314..fd2a73b4 100644 --- a/base/rtc_base.target.linux-x86.mk +++ b/base/rtc_base.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -184,10 +185,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -299,10 +297,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -324,13 +319,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/base/rtc_base.target.linux-x86_64.mk b/base/rtc_base.target.linux-x86_64.mk index ac93c9bf..6440af94 100644 --- a/base/rtc_base.target.linux-x86_64.mk +++ b/base/rtc_base.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_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)) @@ -183,10 +184,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/overrides/include \ $(LOCAL_PATH)/third_party/third_party/jsoncpp/source/include \ - $(LOCAL_PATH)/third_party/boringssl/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/boringssl/src/include # Flags passed to only C++ (and not C) files. @@ -322,13 +317,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/base/rtc_base_approved.target.darwin-arm.mk b/base/rtc_base_approved.target.darwin-arm.mk index a344d413..1a9f8d06 100644 --- a/base/rtc_base_approved.target.darwin-arm.mk +++ b/base/rtc_base_approved.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -127,10 +128,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. @@ -243,10 +241,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. @@ -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/base/rtc_base_approved.target.darwin-arm64.mk b/base/rtc_base_approved.target.darwin-arm64.mk index 729b828c..946a2d77 100644 --- a/base/rtc_base_approved.target.darwin-arm64.mk +++ b/base/rtc_base_approved.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -113,10 +114,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. @@ -214,10 +212,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. @@ -239,13 +234,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/base/rtc_base_approved.target.darwin-mips.mk b/base/rtc_base_approved.target.darwin-mips.mk index bf103a77..86d10c88 100644 --- a/base/rtc_base_approved.target.darwin-mips.mk +++ b/base/rtc_base_approved.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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 := \ $(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. @@ -227,10 +225,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. @@ -253,13 +248,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/base/rtc_base_approved.target.darwin-x86.mk b/base/rtc_base_approved.target.darwin-x86.mk index ac37a54b..2d20e1e6 100644 --- a/base/rtc_base_approved.target.darwin-x86.mk +++ b/base/rtc_base_approved.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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 := \ $(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. @@ -226,10 +224,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. @@ -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/base/rtc_base_approved.target.darwin-x86_64.mk b/base/rtc_base_approved.target.darwin-x86_64.mk index 5a9c8da5..a795a27a 100644 --- a/base/rtc_base_approved.target.darwin-x86_64.mk +++ b/base/rtc_base_approved.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -118,10 +119,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. @@ -224,10 +222,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. @@ -249,13 +244,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/base/rtc_base_approved.target.linux-arm.mk b/base/rtc_base_approved.target.linux-arm.mk index a344d413..1a9f8d06 100644 --- a/base/rtc_base_approved.target.linux-arm.mk +++ b/base/rtc_base_approved.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -127,10 +128,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. @@ -243,10 +241,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. @@ -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/base/rtc_base_approved.target.linux-arm64.mk b/base/rtc_base_approved.target.linux-arm64.mk index 729b828c..946a2d77 100644 --- a/base/rtc_base_approved.target.linux-arm64.mk +++ b/base/rtc_base_approved.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -113,10 +114,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. @@ -214,10 +212,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. @@ -239,13 +234,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/base/rtc_base_approved.target.linux-mips.mk b/base/rtc_base_approved.target.linux-mips.mk index bf103a77..86d10c88 100644 --- a/base/rtc_base_approved.target.linux-mips.mk +++ b/base/rtc_base_approved.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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 := \ $(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. @@ -227,10 +225,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. @@ -253,13 +248,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/base/rtc_base_approved.target.linux-x86.mk b/base/rtc_base_approved.target.linux-x86.mk index ac37a54b..2d20e1e6 100644 --- a/base/rtc_base_approved.target.linux-x86.mk +++ b/base/rtc_base_approved.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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 := \ $(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. @@ -226,10 +224,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. @@ -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/base/rtc_base_approved.target.linux-x86_64.mk b/base/rtc_base_approved.target.linux-x86_64.mk index 5a9c8da5..a795a27a 100644 --- a/base/rtc_base_approved.target.linux-x86_64.mk +++ b/base/rtc_base_approved.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_base_rtc_base_approved_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)) @@ -118,10 +119,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. @@ -224,10 +222,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. @@ -249,13 +244,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/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.darwin-arm.mk +++ b/base/webrtc_base.target.darwin-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.darwin-arm64.mk b/base/webrtc_base.target.darwin-arm64.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.darwin-arm64.mk +++ b/base/webrtc_base.target.darwin-arm64.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.darwin-mips.mk b/base/webrtc_base.target.darwin-mips.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.darwin-mips.mk +++ b/base/webrtc_base.target.darwin-mips.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.darwin-x86.mk b/base/webrtc_base.target.darwin-x86.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.darwin-x86.mk +++ b/base/webrtc_base.target.darwin-x86.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.darwin-x86_64.mk b/base/webrtc_base.target.darwin-x86_64.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.darwin-x86_64.mk +++ b/base/webrtc_base.target.darwin-x86_64.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.linux-arm.mk b/base/webrtc_base.target.linux-arm.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.linux-arm.mk +++ b/base/webrtc_base.target.linux-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.linux-arm64.mk b/base/webrtc_base.target.linux-arm64.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.linux-arm64.mk +++ b/base/webrtc_base.target.linux-arm64.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.linux-mips.mk b/base/webrtc_base.target.linux-mips.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.linux-mips.mk +++ b/base/webrtc_base.target.linux-mips.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.linux-x86.mk b/base/webrtc_base.target.linux-x86.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.linux-x86.mk +++ b/base/webrtc_base.target.linux-x86.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/base/webrtc_base.target.linux-x86_64.mk b/base/webrtc_base.target.linux-x86_64.mk index e8d5bbba..53096c34 100644 --- a/base/webrtc_base.target.linux-x86_64.mk +++ b/base/webrtc_base.target.linux-x86_64.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_base_webrtc_base_gyp LOCAL_MODULE_STEM := webrtc_base LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -22,6 +23,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. ### 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/common_audio/common_audio.target.darwin-arm.mk b/common_audio/common_audio.target.darwin-arm.mk index 580c0b74..3eb07453 100644 --- a/common_audio/common_audio.target.darwin-arm.mk +++ b/common_audio/common_audio.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -176,10 +177,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -323,13 +318,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/common_audio/common_audio.target.darwin-arm64.mk b/common_audio/common_audio.target.darwin-arm64.mk index 6eaafbc6..a6ef4f36 100644 --- a/common_audio/common_audio.target.darwin-arm64.mk +++ b/common_audio/common_audio.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -162,10 +163,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -268,10 +266,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/common_audio/common_audio.target.darwin-mips.mk b/common_audio/common_audio.target.darwin-mips.mk index c72b4bea..028c6044 100644 --- a/common_audio/common_audio.target.darwin-mips.mk +++ b/common_audio/common_audio.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -171,10 +172,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -283,10 +281,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -309,13 +304,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/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk index b171a705..6391219f 100644 --- a/common_audio/common_audio.target.darwin-x86.mk +++ b/common_audio/common_audio.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -167,10 +168,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -278,10 +276,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -303,13 +298,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/common_audio/common_audio.target.darwin-x86_64.mk b/common_audio/common_audio.target.darwin-x86_64.mk index ebe365b6..2c1c5253 100644 --- a/common_audio/common_audio.target.darwin-x86_64.mk +++ b/common_audio/common_audio.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -166,10 +167,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -276,10 +274,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -301,13 +296,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/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk index 580c0b74..3eb07453 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -176,10 +177,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -323,13 +318,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/common_audio/common_audio.target.linux-arm64.mk b/common_audio/common_audio.target.linux-arm64.mk index 6eaafbc6..a6ef4f36 100644 --- a/common_audio/common_audio.target.linux-arm64.mk +++ b/common_audio/common_audio.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -162,10 +163,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -268,10 +266,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/common_audio/common_audio.target.linux-mips.mk b/common_audio/common_audio.target.linux-mips.mk index c72b4bea..028c6044 100644 --- a/common_audio/common_audio.target.linux-mips.mk +++ b/common_audio/common_audio.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -171,10 +172,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -283,10 +281,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -309,13 +304,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/common_audio/common_audio.target.linux-x86.mk b/common_audio/common_audio.target.linux-x86.mk index b171a705..6391219f 100644 --- a/common_audio/common_audio.target.linux-x86.mk +++ b/common_audio/common_audio.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -167,10 +168,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -278,10 +276,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -303,13 +298,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/common_audio/common_audio.target.linux-x86_64.mk b/common_audio/common_audio.target.linux-x86_64.mk index ebe365b6..2c1c5253 100644 --- a/common_audio/common_audio.target.linux-x86_64.mk +++ b/common_audio/common_audio.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_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)) @@ -166,10 +167,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -276,10 +274,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/openmax_dl \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/openmax_dl # Flags passed to only C++ (and not C) files. @@ -301,13 +296,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/common_audio/common_audio_neon.target.darwin-arm.mk b/common_audio/common_audio_neon.target.darwin-arm.mk index fb22957a..20e41998 100644 --- a/common_audio/common_audio_neon.target.darwin-arm.mk +++ b/common_audio/common_audio_neon.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_neon_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)) @@ -128,10 +129,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. @@ -246,10 +244,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. @@ -272,13 +267,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/common_audio/common_audio_neon.target.linux-arm.mk b/common_audio/common_audio_neon.target.linux-arm.mk index fb22957a..20e41998 100644 --- a/common_audio/common_audio_neon.target.linux-arm.mk +++ b/common_audio/common_audio_neon.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_neon_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)) @@ -128,10 +129,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. @@ -246,10 +244,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. @@ -272,13 +267,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/common_audio/common_audio_sse2.target.darwin-x86.mk b/common_audio/common_audio_sse2.target.darwin-x86.mk index 769f48ed..717f668f 100644 --- a/common_audio/common_audio_sse2.target.darwin-x86.mk +++ b/common_audio/common_audio_sse2.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_sse2_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)) @@ -115,10 +116,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. @@ -223,10 +221,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_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/common_audio/common_audio_sse2.target.darwin-x86_64.mk b/common_audio/common_audio_sse2.target.darwin-x86_64.mk index aa9e91ed..28bdeb23 100644 --- a/common_audio/common_audio_sse2.target.darwin-x86_64.mk +++ b/common_audio/common_audio_sse2.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_sse2_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)) @@ -114,10 +115,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. @@ -221,10 +219,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. @@ -246,13 +241,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/common_audio/common_audio_sse2.target.linux-x86.mk b/common_audio/common_audio_sse2.target.linux-x86.mk index 769f48ed..717f668f 100644 --- a/common_audio/common_audio_sse2.target.linux-x86.mk +++ b/common_audio/common_audio_sse2.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_sse2_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)) @@ -115,10 +116,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. @@ -223,10 +221,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_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/common_audio/common_audio_sse2.target.linux-x86_64.mk b/common_audio/common_audio_sse2.target.linux-x86_64.mk index aa9e91ed..28bdeb23 100644 --- a/common_audio/common_audio_sse2.target.linux-x86_64.mk +++ b/common_audio/common_audio_sse2.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_audio_common_audio_sse2_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)) @@ -114,10 +115,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. @@ -221,10 +219,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. @@ -246,13 +241,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/common_video/common_video.target.darwin-arm.mk b/common_video/common_video.target.darwin-arm.mk index 9c2a73aa..0945e18a 100644 --- a/common_video/common_video.target.darwin-arm.mk +++ b/common_video/common_video.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.darwin-arm64.mk b/common_video/common_video.target.darwin-arm64.mk index 2a1f6d8c..d297eac7 100644 --- a/common_video/common_video.target.darwin-arm64.mk +++ b/common_video/common_video.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -249,13 +244,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/common_video/common_video.target.darwin-mips.mk b/common_video/common_video.target.darwin-mips.mk index aad66022..3c9718dd 100644 --- a/common_video/common_video.target.darwin-mips.mk +++ b/common_video/common_video.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -237,10 +235,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.darwin-x86.mk b/common_video/common_video.target.darwin-x86.mk index ae0edc84..456ab68a 100644 --- a/common_video/common_video.target.darwin-x86.mk +++ b/common_video/common_video.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.darwin-x86_64.mk b/common_video/common_video.target.darwin-x86_64.mk index a8dc51a5..41959c1d 100644 --- a/common_video/common_video.target.darwin-x86_64.mk +++ b/common_video/common_video.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -259,13 +254,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/common_video/common_video.target.linux-arm.mk b/common_video/common_video.target.linux-arm.mk index 9c2a73aa..0945e18a 100644 --- a/common_video/common_video.target.linux-arm.mk +++ b/common_video/common_video.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.linux-arm64.mk b/common_video/common_video.target.linux-arm64.mk index 2a1f6d8c..d297eac7 100644 --- a/common_video/common_video.target.linux-arm64.mk +++ b/common_video/common_video.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -249,13 +244,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/common_video/common_video.target.linux-mips.mk b/common_video/common_video.target.linux-mips.mk index aad66022..3c9718dd 100644 --- a/common_video/common_video.target.linux-mips.mk +++ b/common_video/common_video.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -237,10 +235,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.linux-x86.mk b/common_video/common_video.target.linux-x86.mk index ae0edc84..456ab68a 100644 --- a/common_video/common_video.target.linux-x86.mk +++ b/common_video/common_video.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # 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/common_video/common_video.target.linux-x86_64.mk b/common_video/common_video.target.linux-x86_64.mk index a8dc51a5..41959c1d 100644 --- a/common_video/common_video.target.linux-x86_64.mk +++ b/common_video/common_video.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_common_video_common_video_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/libyuv/include \ - $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libyuv # Flags passed to only C++ (and not C) files. @@ -259,13 +254,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-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 diff --git a/modules/CNG.target.darwin-arm.mk b/modules/CNG.target.darwin-arm.mk index 2b9206d6..89c6243c 100644 --- a/modules/CNG.target.darwin-arm.mk +++ b/modules/CNG.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.darwin-arm64.mk b/modules/CNG.target.darwin-arm64.mk index 85fb3eea..eda79925 100644 --- a/modules/CNG.target.darwin-arm64.mk +++ b/modules/CNG.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.darwin-mips.mk b/modules/CNG.target.darwin-mips.mk index 72805e5a..1c4cb11a 100644 --- a/modules/CNG.target.darwin-mips.mk +++ b/modules/CNG.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -241,10 +239,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -267,13 +262,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/modules/CNG.target.darwin-x86.mk b/modules/CNG.target.darwin-x86.mk index 2bd4f12e..0bcb2a8b 100644 --- a/modules/CNG.target.darwin-x86.mk +++ b/modules/CNG.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -238,10 +236,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.darwin-x86_64.mk b/modules/CNG.target.darwin-x86_64.mk index ded34cba..b95a4ba9 100644 --- a/modules/CNG.target.darwin-x86_64.mk +++ b/modules/CNG.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.linux-arm.mk b/modules/CNG.target.linux-arm.mk index 2b9206d6..89c6243c 100644 --- a/modules/CNG.target.linux-arm.mk +++ b/modules/CNG.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.linux-arm64.mk b/modules/CNG.target.linux-arm64.mk index 85fb3eea..eda79925 100644 --- a/modules/CNG.target.linux-arm64.mk +++ b/modules/CNG.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.linux-mips.mk b/modules/CNG.target.linux-mips.mk index 72805e5a..1c4cb11a 100644 --- a/modules/CNG.target.linux-mips.mk +++ b/modules/CNG.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -241,10 +239,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -267,13 +262,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/modules/CNG.target.linux-x86.mk b/modules/CNG.target.linux-x86.mk index 2bd4f12e..0bcb2a8b 100644 --- a/modules/CNG.target.linux-x86.mk +++ b/modules/CNG.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -238,10 +236,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/CNG.target.linux-x86_64.mk b/modules/CNG.target.linux-x86_64.mk index ded34cba..b95a4ba9 100644 --- a/modules/CNG.target.linux-x86_64.mk +++ b/modules/CNG.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_CNG_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # 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/modules/G711.target.darwin-arm.mk b/modules/G711.target.darwin-arm.mk index 3f5f0d76..d39f7064 100644 --- a/modules/G711.target.darwin-arm.mk +++ b/modules/G711.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -249,10 +247,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -275,13 +270,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/modules/G711.target.darwin-arm64.mk b/modules/G711.target.darwin-arm64.mk index fe04356f..af038a2d 100644 --- a/modules/G711.target.darwin-arm64.mk +++ b/modules/G711.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -113,10 +114,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -245,13 +240,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/modules/G711.target.darwin-mips.mk b/modules/G711.target.darwin-mips.mk index 61f96572..04f57b34 100644 --- a/modules/G711.target.darwin-mips.mk +++ b/modules/G711.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -235,10 +233,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # 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/modules/G711.target.darwin-x86.mk b/modules/G711.target.darwin-x86.mk index 977bd0d2..24cd42ff 100644 --- a/modules/G711.target.darwin-x86.mk +++ b/modules/G711.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -232,10 +230,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -257,13 +252,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/modules/G711.target.darwin-x86_64.mk b/modules/G711.target.darwin-x86_64.mk index 0a60761b..263b9197 100644 --- a/modules/G711.target.darwin-x86_64.mk +++ b/modules/G711.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/G711.target.linux-arm.mk b/modules/G711.target.linux-arm.mk index 3f5f0d76..d39f7064 100644 --- a/modules/G711.target.linux-arm.mk +++ b/modules/G711.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -249,10 +247,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -275,13 +270,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/modules/G711.target.linux-arm64.mk b/modules/G711.target.linux-arm64.mk index fe04356f..af038a2d 100644 --- a/modules/G711.target.linux-arm64.mk +++ b/modules/G711.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -113,10 +114,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -245,13 +240,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/modules/G711.target.linux-mips.mk b/modules/G711.target.linux-mips.mk index 61f96572..04f57b34 100644 --- a/modules/G711.target.linux-mips.mk +++ b/modules/G711.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -235,10 +233,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # 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/modules/G711.target.linux-x86.mk b/modules/G711.target.linux-x86.mk index 977bd0d2..24cd42ff 100644 --- a/modules/G711.target.linux-x86.mk +++ b/modules/G711.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -232,10 +230,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -257,13 +252,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/modules/G711.target.linux-x86_64.mk b/modules/G711.target.linux-x86_64.mk index 0a60761b..263b9197 100644 --- a/modules/G711.target.linux-x86_64.mk +++ b/modules/G711.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G711_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/G722.target.darwin-arm.mk b/modules/G722.target.darwin-arm.mk index 908e2ff4..157fbe5c 100644 --- a/modules/G722.target.darwin-arm.mk +++ b/modules/G722.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -128,10 +129,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -250,10 +248,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -276,13 +271,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/modules/G722.target.darwin-arm64.mk b/modules/G722.target.darwin-arm64.mk index 4e90dbfa..a6efa381 100644 --- a/modules/G722.target.darwin-arm64.mk +++ b/modules/G722.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -114,10 +115,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -221,10 +219,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -246,13 +241,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/modules/G722.target.darwin-mips.mk b/modules/G722.target.darwin-mips.mk index db482e51..47cb3f7f 100644 --- a/modules/G722.target.darwin-mips.mk +++ b/modules/G722.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -262,13 +257,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/modules/G722.target.darwin-x86.mk b/modules/G722.target.darwin-x86.mk index 04de01b7..ccf7351f 100644 --- a/modules/G722.target.darwin-x86.mk +++ b/modules/G722.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -258,13 +253,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/modules/G722.target.darwin-x86_64.mk b/modules/G722.target.darwin-x86_64.mk index 9dc83954..cb3cdaa2 100644 --- a/modules/G722.target.darwin-x86_64.mk +++ b/modules/G722.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/G722.target.linux-arm.mk b/modules/G722.target.linux-arm.mk index 908e2ff4..157fbe5c 100644 --- a/modules/G722.target.linux-arm.mk +++ b/modules/G722.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -128,10 +129,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -250,10 +248,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -276,13 +271,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/modules/G722.target.linux-arm64.mk b/modules/G722.target.linux-arm64.mk index 4e90dbfa..a6efa381 100644 --- a/modules/G722.target.linux-arm64.mk +++ b/modules/G722.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -114,10 +115,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -221,10 +219,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -246,13 +241,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/modules/G722.target.linux-mips.mk b/modules/G722.target.linux-mips.mk index db482e51..47cb3f7f 100644 --- a/modules/G722.target.linux-mips.mk +++ b/modules/G722.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -262,13 +257,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/modules/G722.target.linux-x86.mk b/modules/G722.target.linux-x86.mk index 04de01b7..ccf7351f 100644 --- a/modules/G722.target.linux-x86.mk +++ b/modules/G722.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -258,13 +253,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/modules/G722.target.linux-x86_64.mk b/modules/G722.target.linux-x86_64.mk index 9dc83954..cb3cdaa2 100644 --- a/modules/G722.target.linux-x86_64.mk +++ b/modules/G722.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_G722_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/PCM16B.target.darwin-arm.mk b/modules/PCM16B.target.darwin-arm.mk index e10ed11e..4a1b501e 100644 --- a/modules/PCM16B.target.darwin-arm.mk +++ b/modules/PCM16B.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -274,13 +269,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/modules/PCM16B.target.darwin-arm64.mk b/modules/PCM16B.target.darwin-arm64.mk index f112bd0a..cadf3f31 100644 --- a/modules/PCM16B.target.darwin-arm64.mk +++ b/modules/PCM16B.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -244,13 +239,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/modules/PCM16B.target.darwin-mips.mk b/modules/PCM16B.target.darwin-mips.mk index 53397937..1878cd14 100644 --- a/modules/PCM16B.target.darwin-mips.mk +++ b/modules/PCM16B.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -260,13 +255,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/modules/PCM16B.target.darwin-x86.mk b/modules/PCM16B.target.darwin-x86.mk index d75875b6..127a2245 100644 --- a/modules/PCM16B.target.darwin-x86.mk +++ b/modules/PCM16B.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/PCM16B.target.darwin-x86_64.mk b/modules/PCM16B.target.darwin-x86_64.mk index c890a685..0cc8a8df 100644 --- a/modules/PCM16B.target.darwin-x86_64.mk +++ b/modules/PCM16B.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -254,13 +249,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/modules/PCM16B.target.linux-arm.mk b/modules/PCM16B.target.linux-arm.mk index e10ed11e..4a1b501e 100644 --- a/modules/PCM16B.target.linux-arm.mk +++ b/modules/PCM16B.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -274,13 +269,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/modules/PCM16B.target.linux-arm64.mk b/modules/PCM16B.target.linux-arm64.mk index f112bd0a..cadf3f31 100644 --- a/modules/PCM16B.target.linux-arm64.mk +++ b/modules/PCM16B.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -244,13 +239,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/modules/PCM16B.target.linux-mips.mk b/modules/PCM16B.target.linux-mips.mk index 53397937..1878cd14 100644 --- a/modules/PCM16B.target.linux-mips.mk +++ b/modules/PCM16B.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -260,13 +255,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/modules/PCM16B.target.linux-x86.mk b/modules/PCM16B.target.linux-x86.mk index d75875b6..127a2245 100644 --- a/modules/PCM16B.target.linux-x86.mk +++ b/modules/PCM16B.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/PCM16B.target.linux-x86_64.mk b/modules/PCM16B.target.linux-x86_64.mk index c890a685..0cc8a8df 100644 --- a/modules/PCM16B.target.linux-x86_64.mk +++ b/modules/PCM16B.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_PCM16B_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc # Flags passed to only C++ (and not C) files. @@ -254,13 +249,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/modules/audio_coding_module.target.darwin-arm.mk b/modules/audio_coding_module.target.darwin-arm.mk index 508f5646..20692837 100644 --- a/modules/audio_coding_module.target.darwin-arm.mk +++ b/modules/audio_coding_module.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -170,10 +171,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -308,10 +306,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -334,13 +329,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/modules/audio_coding_module.target.darwin-arm64.mk b/modules/audio_coding_module.target.darwin-arm64.mk index 5cc94559..d2d9e5d0 100644 --- a/modules/audio_coding_module.target.darwin-arm64.mk +++ b/modules/audio_coding_module.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -279,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -304,13 +299,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/modules/audio_coding_module.target.darwin-mips.mk b/modules/audio_coding_module.target.darwin-mips.mk index 5a1df405..e0136bc6 100644 --- a/modules/audio_coding_module.target.darwin-mips.mk +++ b/modules/audio_coding_module.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -163,10 +164,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -294,10 +292,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -320,13 +315,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/modules/audio_coding_module.target.darwin-x86.mk b/modules/audio_coding_module.target.darwin-x86.mk index 6cc5d2f1..cadfa95d 100644 --- a/modules/audio_coding_module.target.darwin-x86.mk +++ b/modules/audio_coding_module.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -162,10 +163,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -291,10 +289,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -316,13 +311,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/modules/audio_coding_module.target.darwin-x86_64.mk b/modules/audio_coding_module.target.darwin-x86_64.mk index 3b899aaa..87c0dc55 100644 --- a/modules/audio_coding_module.target.darwin-x86_64.mk +++ b/modules/audio_coding_module.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -161,10 +162,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -289,10 +287,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -314,13 +309,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/modules/audio_coding_module.target.linux-arm.mk b/modules/audio_coding_module.target.linux-arm.mk index 508f5646..20692837 100644 --- a/modules/audio_coding_module.target.linux-arm.mk +++ b/modules/audio_coding_module.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -170,10 +171,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -308,10 +306,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -334,13 +329,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/modules/audio_coding_module.target.linux-arm64.mk b/modules/audio_coding_module.target.linux-arm64.mk index 5cc94559..d2d9e5d0 100644 --- a/modules/audio_coding_module.target.linux-arm64.mk +++ b/modules/audio_coding_module.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -279,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -304,13 +299,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/modules/audio_coding_module.target.linux-mips.mk b/modules/audio_coding_module.target.linux-mips.mk index 5a1df405..e0136bc6 100644 --- a/modules/audio_coding_module.target.linux-mips.mk +++ b/modules/audio_coding_module.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -163,10 +164,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -294,10 +292,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -320,13 +315,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/modules/audio_coding_module.target.linux-x86.mk b/modules/audio_coding_module.target.linux-x86.mk index 6cc5d2f1..cadfa95d 100644 --- a/modules/audio_coding_module.target.linux-x86.mk +++ b/modules/audio_coding_module.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -162,10 +163,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -291,10 +289,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -316,13 +311,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/modules/audio_coding_module.target.linux-x86_64.mk b/modules/audio_coding_module.target.linux-x86_64.mk index 3b899aaa..87c0dc55 100644 --- a/modules/audio_coding_module.target.linux-x86_64.mk +++ b/modules/audio_coding_module.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_coding_module_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)) @@ -161,10 +162,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -289,10 +287,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(LOCAL_PATH)/third_party/opus/src/celt \ $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -314,13 +309,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/modules/audio_conference_mixer.target.darwin-arm.mk b/modules/audio_conference_mixer.target.darwin-arm.mk index 2dbe1a72..0ed87e3d 100644 --- a/modules/audio_conference_mixer.target.darwin-arm.mk +++ b/modules/audio_conference_mixer.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -280,13 +275,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/modules/audio_conference_mixer.target.darwin-arm64.mk b/modules/audio_conference_mixer.target.darwin-arm64.mk index 03e49495..723a57b7 100644 --- a/modules/audio_conference_mixer.target.darwin-arm64.mk +++ b/modules/audio_conference_mixer.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -225,10 +223,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -250,13 +245,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/modules/audio_conference_mixer.target.darwin-mips.mk b/modules/audio_conference_mixer.target.darwin-mips.mk index 04aa07a2..1f346a55 100644 --- a/modules/audio_conference_mixer.target.darwin-mips.mk +++ b/modules/audio_conference_mixer.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -240,10 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -266,13 +261,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/modules/audio_conference_mixer.target.darwin-x86.mk b/modules/audio_conference_mixer.target.darwin-x86.mk index 96610e13..dfe3e3f7 100644 --- a/modules/audio_conference_mixer.target.darwin-x86.mk +++ b/modules/audio_conference_mixer.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -237,10 +235,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -262,13 +257,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/modules/audio_conference_mixer.target.darwin-x86_64.mk b/modules/audio_conference_mixer.target.darwin-x86_64.mk index eea34c16..34d0d03b 100644 --- a/modules/audio_conference_mixer.target.darwin-x86_64.mk +++ b/modules/audio_conference_mixer.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -235,10 +233,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -260,13 +255,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/modules/audio_conference_mixer.target.linux-arm.mk b/modules/audio_conference_mixer.target.linux-arm.mk index 2dbe1a72..0ed87e3d 100644 --- a/modules/audio_conference_mixer.target.linux-arm.mk +++ b/modules/audio_conference_mixer.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -280,13 +275,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/modules/audio_conference_mixer.target.linux-arm64.mk b/modules/audio_conference_mixer.target.linux-arm64.mk index 03e49495..723a57b7 100644 --- a/modules/audio_conference_mixer.target.linux-arm64.mk +++ b/modules/audio_conference_mixer.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -225,10 +223,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -250,13 +245,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/modules/audio_conference_mixer.target.linux-mips.mk b/modules/audio_conference_mixer.target.linux-mips.mk index 04aa07a2..1f346a55 100644 --- a/modules/audio_conference_mixer.target.linux-mips.mk +++ b/modules/audio_conference_mixer.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -240,10 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -266,13 +261,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/modules/audio_conference_mixer.target.linux-x86.mk b/modules/audio_conference_mixer.target.linux-x86.mk index 96610e13..dfe3e3f7 100644 --- a/modules/audio_conference_mixer.target.linux-x86.mk +++ b/modules/audio_conference_mixer.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -237,10 +235,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -262,13 +257,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/modules/audio_conference_mixer.target.linux-x86_64.mk b/modules/audio_conference_mixer.target.linux-x86_64.mk index eea34c16..34d0d03b 100644 --- a/modules/audio_conference_mixer.target.linux-x86_64.mk +++ b/modules/audio_conference_mixer.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_conference_mixer_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -235,10 +233,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -260,13 +255,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/modules/audio_device.target.darwin-arm.mk b/modules/audio_device.target.darwin-arm.mk index 079d68d7..53c1524d 100644 --- a/modules/audio_device.target.darwin-arm.mk +++ b/modules/audio_device.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -271,10 +269,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -297,13 +292,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/modules/audio_device.target.darwin-arm64.mk b/modules/audio_device.target.darwin-arm64.mk index eec0509f..a08695d7 100644 --- a/modules/audio_device.target.darwin-arm64.mk +++ b/modules/audio_device.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -242,10 +240,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -267,13 +262,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/modules/audio_device.target.darwin-mips.mk b/modules/audio_device.target.darwin-mips.mk index 1cf57cb6..5df8c25a 100644 --- a/modules/audio_device.target.darwin-mips.mk +++ b/modules/audio_device.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -134,10 +135,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/audio_device.target.darwin-x86.mk b/modules/audio_device.target.darwin-x86.mk index ca766487..c291cba8 100644 --- a/modules/audio_device.target.darwin-x86.mk +++ b/modules/audio_device.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/audio_device.target.darwin-x86_64.mk b/modules/audio_device.target.darwin-x86_64.mk index e9d02cea..0ef2646c 100644 --- a/modules/audio_device.target.darwin-x86_64.mk +++ b/modules/audio_device.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -132,10 +133,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -277,13 +272,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/modules/audio_device.target.linux-arm.mk b/modules/audio_device.target.linux-arm.mk index 079d68d7..53c1524d 100644 --- a/modules/audio_device.target.linux-arm.mk +++ b/modules/audio_device.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -271,10 +269,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -297,13 +292,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/modules/audio_device.target.linux-arm64.mk b/modules/audio_device.target.linux-arm64.mk index eec0509f..a08695d7 100644 --- a/modules/audio_device.target.linux-arm64.mk +++ b/modules/audio_device.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -242,10 +240,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -267,13 +262,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/modules/audio_device.target.linux-mips.mk b/modules/audio_device.target.linux-mips.mk index 1cf57cb6..5df8c25a 100644 --- a/modules/audio_device.target.linux-mips.mk +++ b/modules/audio_device.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -134,10 +135,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/audio_device.target.linux-x86.mk b/modules/audio_device.target.linux-x86.mk index ca766487..c291cba8 100644 --- a/modules/audio_device.target.linux-x86.mk +++ b/modules/audio_device.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/audio_device.target.linux-x86_64.mk b/modules/audio_device.target.linux-x86_64.mk index e9d02cea..0ef2646c 100644 --- a/modules/audio_device.target.linux-x86_64.mk +++ b/modules/audio_device.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_device_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)) @@ -132,10 +133,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -277,13 +272,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/modules/audio_processing.target.darwin-arm.mk b/modules/audio_processing.target.darwin-arm.mk index 00d97143..390d53b1 100644 --- a/modules/audio_processing.target.darwin-arm.mk +++ b/modules/audio_processing.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -165,10 +166,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -323,13 +318,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/modules/audio_processing.target.darwin-arm64.mk b/modules/audio_processing.target.darwin-arm64.mk index b8c41261..a38ae25d 100644 --- a/modules/audio_processing.target.darwin-arm64.mk +++ b/modules/audio_processing.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -292,13 +287,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/modules/audio_processing.target.darwin-mips.mk b/modules/audio_processing.target.darwin-mips.mk index 8347d6ca..f3aafedc 100644 --- a/modules/audio_processing.target.darwin-mips.mk +++ b/modules/audio_processing.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -159,10 +160,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -284,10 +282,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -310,13 +305,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/modules/audio_processing.target.darwin-x86.mk b/modules/audio_processing.target.darwin-x86.mk index d0dfbdd3..7d3a4663 100644 --- a/modules/audio_processing.target.darwin-x86.mk +++ b/modules/audio_processing.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -279,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -304,13 +299,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/modules/audio_processing.target.darwin-x86_64.mk b/modules/audio_processing.target.darwin-x86_64.mk index 24ed0ef2..9fef80ec 100644 --- a/modules/audio_processing.target.darwin-x86_64.mk +++ b/modules/audio_processing.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -277,10 +275,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -302,13 +297,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/modules/audio_processing.target.linux-arm.mk b/modules/audio_processing.target.linux-arm.mk index 00d97143..390d53b1 100644 --- a/modules/audio_processing.target.linux-arm.mk +++ b/modules/audio_processing.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -165,10 +166,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -297,10 +295,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -323,13 +318,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/modules/audio_processing.target.linux-arm64.mk b/modules/audio_processing.target.linux-arm64.mk index b8c41261..a38ae25d 100644 --- a/modules/audio_processing.target.linux-arm64.mk +++ b/modules/audio_processing.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -292,13 +287,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/modules/audio_processing.target.linux-mips.mk b/modules/audio_processing.target.linux-mips.mk index 8347d6ca..f3aafedc 100644 --- a/modules/audio_processing.target.linux-mips.mk +++ b/modules/audio_processing.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -159,10 +160,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -284,10 +282,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -310,13 +305,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/modules/audio_processing.target.linux-x86.mk b/modules/audio_processing.target.linux-x86.mk index d0dfbdd3..7d3a4663 100644 --- a/modules/audio_processing.target.linux-x86.mk +++ b/modules/audio_processing.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -279,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -304,13 +299,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/modules/audio_processing.target.linux-x86_64.mk b/modules/audio_processing.target.linux-x86_64.mk index 24ed0ef2..9fef80ec 100644 --- a/modules/audio_processing.target.linux-x86_64.mk +++ b/modules/audio_processing.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -277,10 +275,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -302,13 +297,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/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk index e7aec566..d98f741b 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_modules_audio_processing_gen_aecm_core_neon_o LOCAL_MODULE_STEM := gen_aecm_core_neon_offsets_h LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -150,10 +151,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. @@ -266,10 +264,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. @@ -294,6 +289,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### 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/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk index e7aec566..d98f741b 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_modules_audio_processing_gen_aecm_core_neon_o LOCAL_MODULE_STEM := gen_aecm_core_neon_offsets_h LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -150,10 +151,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. @@ -266,10 +264,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. @@ -294,6 +289,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### 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/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk index b18e916b..f4665652 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_modules_audio_processing_gen_nsx_core_neon_of LOCAL_MODULE_STEM := gen_nsx_core_neon_offsets_h LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -150,10 +151,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. @@ -266,10 +264,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. @@ -294,6 +289,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### 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/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk index b18e916b..f4665652 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk @@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_webrtc_modules_audio_processing_gen_nsx_core_neon_of LOCAL_MODULE_STEM := gen_nsx_core_neon_offsets_h LOCAL_MODULE_SUFFIX := .stamp 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)) @@ -150,10 +151,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. @@ -266,10 +264,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. @@ -294,6 +289,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### 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/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk index 9ec5969f..34f36c28 100644 --- a/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk +++ b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := lib_core_neon_offsets 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)) @@ -121,10 +122,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. @@ -237,10 +235,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. @@ -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/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk index 9ec5969f..34f36c28 100644 --- a/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk +++ b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := lib_core_neon_offsets 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)) @@ -121,10 +122,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. @@ -237,10 +235,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. @@ -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/modules/audio_processing_neon.target.darwin-arm.mk b/modules/audio_processing_neon.target.darwin-arm.mk index 874783f1..0768a375 100644 --- a/modules/audio_processing_neon.target.darwin-arm.mk +++ b/modules/audio_processing_neon.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_neon_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)) @@ -136,10 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -288,13 +283,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/modules/audio_processing_neon.target.linux-arm.mk b/modules/audio_processing_neon.target.linux-arm.mk index 874783f1..0768a375 100644 --- a/modules/audio_processing_neon.target.linux-arm.mk +++ b/modules/audio_processing_neon.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_neon_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)) @@ -136,10 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -288,13 +283,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/modules/audio_processing_sse2.target.darwin-x86.mk b/modules/audio_processing_sse2.target.darwin-x86.mk index 1eb9bb4a..9ed7ab8b 100644 --- a/modules/audio_processing_sse2.target.darwin-x86.mk +++ b/modules/audio_processing_sse2.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_sse2_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)) @@ -118,10 +119,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. @@ -230,10 +228,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. @@ -255,13 +250,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/modules/audio_processing_sse2.target.darwin-x86_64.mk b/modules/audio_processing_sse2.target.darwin-x86_64.mk index 849b7b13..8290af96 100644 --- a/modules/audio_processing_sse2.target.darwin-x86_64.mk +++ b/modules/audio_processing_sse2.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_sse2_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/audio_processing_sse2.target.linux-x86.mk b/modules/audio_processing_sse2.target.linux-x86.mk index 1eb9bb4a..9ed7ab8b 100644 --- a/modules/audio_processing_sse2.target.linux-x86.mk +++ b/modules/audio_processing_sse2.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_sse2_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)) @@ -118,10 +119,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. @@ -230,10 +228,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. @@ -255,13 +250,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/modules/audio_processing_sse2.target.linux-x86_64.mk b/modules/audio_processing_sse2.target.linux-x86_64.mk index 849b7b13..8290af96 100644 --- a/modules/audio_processing_sse2.target.linux-x86_64.mk +++ b/modules/audio_processing_sse2.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audio_processing_sse2_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/audioproc_debug_proto.target.darwin-arm.mk b/modules/audioproc_debug_proto.target.darwin-arm.mk index a2f22ccf..bdee9e52 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -281,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -307,13 +302,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/modules/audioproc_debug_proto.target.darwin-arm64.mk b/modules/audioproc_debug_proto.target.darwin-arm64.mk index a97bea8c..3673dd99 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm64.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -277,13 +272,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/modules/audioproc_debug_proto.target.darwin-mips.mk b/modules/audioproc_debug_proto.target.darwin-mips.mk index bb5fd0a8..804bf2f2 100644 --- a/modules/audioproc_debug_proto.target.darwin-mips.mk +++ b/modules/audioproc_debug_proto.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/modules/audioproc_debug_proto.target.darwin-x86.mk b/modules/audioproc_debug_proto.target.darwin-x86.mk index d916094a..cf766c63 100644 --- a/modules/audioproc_debug_proto.target.darwin-x86.mk +++ b/modules/audioproc_debug_proto.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -289,13 +284,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/modules/audioproc_debug_proto.target.darwin-x86_64.mk b/modules/audioproc_debug_proto.target.darwin-x86_64.mk index 26a9767c..cbf5f954 100644 --- a/modules/audioproc_debug_proto.target.darwin-x86_64.mk +++ b/modules/audioproc_debug_proto.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -146,10 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/audioproc_debug_proto.target.linux-arm.mk b/modules/audioproc_debug_proto.target.linux-arm.mk index a2f22ccf..bdee9e52 100644 --- a/modules/audioproc_debug_proto.target.linux-arm.mk +++ b/modules/audioproc_debug_proto.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -281,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -307,13 +302,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/modules/audioproc_debug_proto.target.linux-arm64.mk b/modules/audioproc_debug_proto.target.linux-arm64.mk index a97bea8c..3673dd99 100644 --- a/modules/audioproc_debug_proto.target.linux-arm64.mk +++ b/modules/audioproc_debug_proto.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -277,13 +272,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/modules/audioproc_debug_proto.target.linux-mips.mk b/modules/audioproc_debug_proto.target.linux-mips.mk index bb5fd0a8..804bf2f2 100644 --- a/modules/audioproc_debug_proto.target.linux-mips.mk +++ b/modules/audioproc_debug_proto.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/modules/audioproc_debug_proto.target.linux-x86.mk b/modules/audioproc_debug_proto.target.linux-x86.mk index d916094a..cf766c63 100644 --- a/modules/audioproc_debug_proto.target.linux-x86.mk +++ b/modules/audioproc_debug_proto.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -289,13 +284,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/modules/audioproc_debug_proto.target.linux-x86_64.mk b/modules/audioproc_debug_proto.target.linux-x86_64.mk index 26a9767c..cbf5f954 100644 --- a/modules/audioproc_debug_proto.target.linux-x86_64.mk +++ b/modules/audioproc_debug_proto.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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)) @@ -146,10 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ - $(LOCAL_PATH)/third_party/protobuf/src \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/protobuf/src # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/bitrate_controller.target.darwin-arm.mk b/modules/bitrate_controller.target.darwin-arm.mk index b153423b..53e71660 100644 --- a/modules/bitrate_controller.target.darwin-arm.mk +++ b/modules/bitrate_controller.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -274,13 +269,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/modules/bitrate_controller.target.darwin-arm64.mk b/modules/bitrate_controller.target.darwin-arm64.mk index 2fdc7caf..aa9c6900 100644 --- a/modules/bitrate_controller.target.darwin-arm64.mk +++ b/modules/bitrate_controller.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -113,10 +114,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +239,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/modules/bitrate_controller.target.darwin-mips.mk b/modules/bitrate_controller.target.darwin-mips.mk index 4e5726db..63836ac5 100644 --- a/modules/bitrate_controller.target.darwin-mips.mk +++ b/modules/bitrate_controller.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -260,13 +255,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/modules/bitrate_controller.target.darwin-x86.mk b/modules/bitrate_controller.target.darwin-x86.mk index 836ea984..6785f43b 100644 --- a/modules/bitrate_controller.target.darwin-x86.mk +++ b/modules/bitrate_controller.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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/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. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +251,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/modules/bitrate_controller.target.darwin-x86_64.mk b/modules/bitrate_controller.target.darwin-x86_64.mk index 7e8e62b3..28ac4137 100644 --- a/modules/bitrate_controller.target.darwin-x86_64.mk +++ b/modules/bitrate_controller.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +249,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/modules/bitrate_controller.target.linux-arm.mk b/modules/bitrate_controller.target.linux-arm.mk index b153423b..53e71660 100644 --- a/modules/bitrate_controller.target.linux-arm.mk +++ b/modules/bitrate_controller.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -127,10 +128,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -274,13 +269,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/modules/bitrate_controller.target.linux-arm64.mk b/modules/bitrate_controller.target.linux-arm64.mk index 2fdc7caf..aa9c6900 100644 --- a/modules/bitrate_controller.target.linux-arm64.mk +++ b/modules/bitrate_controller.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -113,10 +114,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +239,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/modules/bitrate_controller.target.linux-mips.mk b/modules/bitrate_controller.target.linux-mips.mk index 4e5726db..63836ac5 100644 --- a/modules/bitrate_controller.target.linux-mips.mk +++ b/modules/bitrate_controller.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -260,13 +255,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/modules/bitrate_controller.target.linux-x86.mk b/modules/bitrate_controller.target.linux-x86.mk index 836ea984..6785f43b 100644 --- a/modules/bitrate_controller.target.linux-x86.mk +++ b/modules/bitrate_controller.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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/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. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +251,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/modules/bitrate_controller.target.linux-x86_64.mk b/modules/bitrate_controller.target.linux-x86_64.mk index 7e8e62b3..28ac4137 100644 --- a/modules/bitrate_controller.target.linux-x86_64.mk +++ b/modules/bitrate_controller.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_bitrate_controller_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +249,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/modules/iLBC.target.darwin-arm.mk b/modules/iLBC.target.darwin-arm.mk index a4f51b44..8910a1c4 100644 --- a/modules/iLBC.target.darwin-arm.mk +++ b/modules/iLBC.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -197,10 +198,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -322,10 +320,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -348,13 +343,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/modules/iLBC.target.darwin-arm64.mk b/modules/iLBC.target.darwin-arm64.mk index 7545cac2..fc93c3e9 100644 --- a/modules/iLBC.target.darwin-arm64.mk +++ b/modules/iLBC.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -183,10 +184,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -293,10 +291,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -318,13 +313,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/modules/iLBC.target.darwin-mips.mk b/modules/iLBC.target.darwin-mips.mk index 4559eb31..a8a606a5 100644 --- a/modules/iLBC.target.darwin-mips.mk +++ b/modules/iLBC.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -190,10 +191,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -308,10 +306,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -334,13 +329,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/modules/iLBC.target.darwin-x86.mk b/modules/iLBC.target.darwin-x86.mk index ad773ed5..6ddb5803 100644 --- a/modules/iLBC.target.darwin-x86.mk +++ b/modules/iLBC.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -189,10 +190,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -305,10 +303,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -330,13 +325,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/modules/iLBC.target.darwin-x86_64.mk b/modules/iLBC.target.darwin-x86_64.mk index 33477434..71e7fd69 100644 --- a/modules/iLBC.target.darwin-x86_64.mk +++ b/modules/iLBC.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -188,10 +189,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -303,10 +301,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -328,13 +323,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/modules/iLBC.target.linux-arm.mk b/modules/iLBC.target.linux-arm.mk index a4f51b44..8910a1c4 100644 --- a/modules/iLBC.target.linux-arm.mk +++ b/modules/iLBC.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -197,10 +198,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -322,10 +320,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -348,13 +343,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/modules/iLBC.target.linux-arm64.mk b/modules/iLBC.target.linux-arm64.mk index 7545cac2..fc93c3e9 100644 --- a/modules/iLBC.target.linux-arm64.mk +++ b/modules/iLBC.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -183,10 +184,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -293,10 +291,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -318,13 +313,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/modules/iLBC.target.linux-mips.mk b/modules/iLBC.target.linux-mips.mk index 4559eb31..a8a606a5 100644 --- a/modules/iLBC.target.linux-mips.mk +++ b/modules/iLBC.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -190,10 +191,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -308,10 +306,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -334,13 +329,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/modules/iLBC.target.linux-x86.mk b/modules/iLBC.target.linux-x86.mk index ad773ed5..6ddb5803 100644 --- a/modules/iLBC.target.linux-x86.mk +++ b/modules/iLBC.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -189,10 +190,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -305,10 +303,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -330,13 +325,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/modules/iLBC.target.linux-x86_64.mk b/modules/iLBC.target.linux-x86_64.mk index 33477434..71e7fd69 100644 --- a/modules/iLBC.target.linux-x86_64.mk +++ b/modules/iLBC.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iLBC_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)) @@ -188,10 +189,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -303,10 +301,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -328,13 +323,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/modules/iSAC.target.darwin-arm.mk b/modules/iSAC.target.darwin-arm.mk index 1d216113..08f67a1a 100644 --- a/modules/iSAC.target.darwin-arm.mk +++ b/modules/iSAC.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -281,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -307,13 +302,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/modules/iSAC.target.darwin-arm64.mk b/modules/iSAC.target.darwin-arm64.mk index d281a993..4316bb41 100644 --- a/modules/iSAC.target.darwin-arm64.mk +++ b/modules/iSAC.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -277,13 +272,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/modules/iSAC.target.darwin-mips.mk b/modules/iSAC.target.darwin-mips.mk index f9d03ea4..f053dae4 100644 --- a/modules/iSAC.target.darwin-mips.mk +++ b/modules/iSAC.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/modules/iSAC.target.darwin-x86.mk b/modules/iSAC.target.darwin-x86.mk index 4708fabc..2c79e26e 100644 --- a/modules/iSAC.target.darwin-x86.mk +++ b/modules/iSAC.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -289,13 +284,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/modules/iSAC.target.darwin-x86_64.mk b/modules/iSAC.target.darwin-x86_64.mk index f6b353cf..5a5ec7f2 100644 --- a/modules/iSAC.target.darwin-x86_64.mk +++ b/modules/iSAC.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/iSAC.target.linux-arm.mk b/modules/iSAC.target.linux-arm.mk index 1d216113..08f67a1a 100644 --- a/modules/iSAC.target.linux-arm.mk +++ b/modules/iSAC.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -156,10 +157,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -281,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -307,13 +302,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/modules/iSAC.target.linux-arm64.mk b/modules/iSAC.target.linux-arm64.mk index d281a993..4316bb41 100644 --- a/modules/iSAC.target.linux-arm64.mk +++ b/modules/iSAC.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -277,13 +272,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/modules/iSAC.target.linux-mips.mk b/modules/iSAC.target.linux-mips.mk index f9d03ea4..f053dae4 100644 --- a/modules/iSAC.target.linux-mips.mk +++ b/modules/iSAC.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -267,10 +265,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -293,13 +288,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/modules/iSAC.target.linux-x86.mk b/modules/iSAC.target.linux-x86.mk index 4708fabc..2c79e26e 100644 --- a/modules/iSAC.target.linux-x86.mk +++ b/modules/iSAC.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -289,13 +284,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/modules/iSAC.target.linux-x86_64.mk b/modules/iSAC.target.linux-x86_64.mk index f6b353cf..5a5ec7f2 100644 --- a/modules/iSAC.target.linux-x86_64.mk +++ b/modules/iSAC.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSAC_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk index cec0e771..70b63bdb 100644 --- a/modules/iSACFix.target.darwin-arm.mk +++ b/modules/iSACFix.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -157,10 +158,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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,10 +281,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -309,13 +304,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/modules/iSACFix.target.darwin-arm64.mk b/modules/iSACFix.target.darwin-arm64.mk index 67fb8252..1a06d01f 100644 --- a/modules/iSACFix.target.darwin-arm64.mk +++ b/modules/iSACFix.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -143,10 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/iSACFix.target.darwin-mips.mk b/modules/iSACFix.target.darwin-mips.mk index d89da4fb..efa51db7 100644 --- a/modules/iSACFix.target.darwin-mips.mk +++ b/modules/iSACFix.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -272,10 +270,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -298,13 +293,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/modules/iSACFix.target.darwin-x86.mk b/modules/iSACFix.target.darwin-x86.mk index dd28ba5a..1c0e863c 100644 --- a/modules/iSACFix.target.darwin-x86.mk +++ b/modules/iSACFix.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -266,10 +264,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -291,13 +286,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/modules/iSACFix.target.darwin-x86_64.mk b/modules/iSACFix.target.darwin-x86_64.mk index c0a9c418..96319419 100644 --- a/modules/iSACFix.target.darwin-x86_64.mk +++ b/modules/iSACFix.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -289,13 +284,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/modules/iSACFix.target.linux-arm.mk b/modules/iSACFix.target.linux-arm.mk index cec0e771..70b63bdb 100644 --- a/modules/iSACFix.target.linux-arm.mk +++ b/modules/iSACFix.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -157,10 +158,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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,10 +281,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -309,13 +304,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/modules/iSACFix.target.linux-arm64.mk b/modules/iSACFix.target.linux-arm64.mk index 67fb8252..1a06d01f 100644 --- a/modules/iSACFix.target.linux-arm64.mk +++ b/modules/iSACFix.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -143,10 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/modules/iSACFix.target.linux-mips.mk b/modules/iSACFix.target.linux-mips.mk index d89da4fb..efa51db7 100644 --- a/modules/iSACFix.target.linux-mips.mk +++ b/modules/iSACFix.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -272,10 +270,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -298,13 +293,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/modules/iSACFix.target.linux-x86.mk b/modules/iSACFix.target.linux-x86.mk index dd28ba5a..1c0e863c 100644 --- a/modules/iSACFix.target.linux-x86.mk +++ b/modules/iSACFix.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -266,10 +264,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -291,13 +286,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/modules/iSACFix.target.linux-x86_64.mk b/modules/iSACFix.target.linux-x86_64.mk index c0a9c418..96319419 100644 --- a/modules/iSACFix.target.linux-x86_64.mk +++ b/modules/iSACFix.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_iSACFix_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)) @@ -148,10 +149,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -289,13 +284,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/modules/isac_neon.target.darwin-arm.mk b/modules/isac_neon.target.darwin-arm.mk index 07387669..a1d6a2ea 100644 --- a/modules/isac_neon.target.darwin-arm.mk +++ b/modules/isac_neon.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_isac_neon_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)) @@ -135,10 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -261,10 +259,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/isac_neon.target.linux-arm.mk b/modules/isac_neon.target.linux-arm.mk index 07387669..a1d6a2ea 100644 --- a/modules/isac_neon.target.linux-arm.mk +++ b/modules/isac_neon.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_isac_neon_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)) @@ -135,10 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -261,10 +259,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include # Flags passed to only C++ (and not C) files. @@ -287,13 +282,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/modules/media_file.target.darwin-arm.mk b/modules/media_file.target.darwin-arm.mk index e66b6d54..4f5ced53 100644 --- a/modules/media_file.target.darwin-arm.mk +++ b/modules/media_file.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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/modules/media_file.target.darwin-arm64.mk b/modules/media_file.target.darwin-arm64.mk index 2f85bb2f..76cdbf34 100644 --- a/modules/media_file.target.darwin-arm64.mk +++ b/modules/media_file.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -249,13 +244,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/modules/media_file.target.darwin-mips.mk b/modules/media_file.target.darwin-mips.mk index f095c8a6..bcb16ed4 100644 --- a/modules/media_file.target.darwin-mips.mk +++ b/modules/media_file.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -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/modules/media_file.target.darwin-x86.mk b/modules/media_file.target.darwin-x86.mk index 8ebe719a..1977155a 100644 --- a/modules/media_file.target.darwin-x86.mk +++ b/modules/media_file.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -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/modules/media_file.target.darwin-x86_64.mk b/modules/media_file.target.darwin-x86_64.mk index f0ad129d..4161d58c 100644 --- a/modules/media_file.target.darwin-x86_64.mk +++ b/modules/media_file.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -259,13 +254,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/modules/media_file.target.linux-arm.mk b/modules/media_file.target.linux-arm.mk index e66b6d54..4f5ced53 100644 --- a/modules/media_file.target.linux-arm.mk +++ b/modules/media_file.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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/modules/media_file.target.linux-arm64.mk b/modules/media_file.target.linux-arm64.mk index 2f85bb2f..76cdbf34 100644 --- a/modules/media_file.target.linux-arm64.mk +++ b/modules/media_file.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -249,13 +244,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/modules/media_file.target.linux-mips.mk b/modules/media_file.target.linux-mips.mk index f095c8a6..bcb16ed4 100644 --- a/modules/media_file.target.linux-mips.mk +++ b/modules/media_file.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -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/modules/media_file.target.linux-x86.mk b/modules/media_file.target.linux-x86.mk index 8ebe719a..1977155a 100644 --- a/modules/media_file.target.linux-x86.mk +++ b/modules/media_file.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -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/modules/media_file.target.linux-x86_64.mk b/modules/media_file.target.linux-x86_64.mk index f0ad129d..4161d58c 100644 --- a/modules/media_file.target.linux-x86_64.mk +++ b/modules/media_file.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_media_file_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(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. @@ -259,13 +254,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/modules/neteq.target.darwin-arm.mk b/modules/neteq.target.darwin-arm.mk index 5c9def6b..e478ecb9 100644 --- a/modules/neteq.target.darwin-arm.mk +++ b/modules/neteq.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -173,10 +174,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -309,10 +307,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -335,13 +330,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/modules/neteq.target.darwin-arm64.mk b/modules/neteq.target.darwin-arm64.mk index 191bdb51..58aa7003 100644 --- a/modules/neteq.target.darwin-arm64.mk +++ b/modules/neteq.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -159,10 +160,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -280,10 +278,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -305,13 +300,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/modules/neteq.target.darwin-mips.mk b/modules/neteq.target.darwin-mips.mk index 04d944bd..5d0bbc6f 100644 --- a/modules/neteq.target.darwin-mips.mk +++ b/modules/neteq.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -166,10 +167,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -295,10 +293,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -321,13 +316,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/modules/neteq.target.darwin-x86.mk b/modules/neteq.target.darwin-x86.mk index 2f8aae3c..b768a6d7 100644 --- a/modules/neteq.target.darwin-x86.mk +++ b/modules/neteq.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -165,10 +166,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -292,10 +290,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -317,13 +312,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/modules/neteq.target.darwin-x86_64.mk b/modules/neteq.target.darwin-x86_64.mk index 05d12963..bd7eca2a 100644 --- a/modules/neteq.target.darwin-x86_64.mk +++ b/modules/neteq.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -164,10 +165,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -290,10 +288,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -315,13 +310,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/modules/neteq.target.linux-arm.mk b/modules/neteq.target.linux-arm.mk index 5c9def6b..e478ecb9 100644 --- a/modules/neteq.target.linux-arm.mk +++ b/modules/neteq.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -173,10 +174,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -309,10 +307,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -335,13 +330,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/modules/neteq.target.linux-arm64.mk b/modules/neteq.target.linux-arm64.mk index 191bdb51..58aa7003 100644 --- a/modules/neteq.target.linux-arm64.mk +++ b/modules/neteq.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -159,10 +160,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -280,10 +278,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -305,13 +300,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/modules/neteq.target.linux-mips.mk b/modules/neteq.target.linux-mips.mk index 04d944bd..5d0bbc6f 100644 --- a/modules/neteq.target.linux-mips.mk +++ b/modules/neteq.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -166,10 +167,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -295,10 +293,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -321,13 +316,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/modules/neteq.target.linux-x86.mk b/modules/neteq.target.linux-x86.mk index 2f8aae3c..b768a6d7 100644 --- a/modules/neteq.target.linux-x86.mk +++ b/modules/neteq.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -165,10 +166,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -292,10 +290,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -317,13 +312,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/modules/neteq.target.linux-x86_64.mk b/modules/neteq.target.linux-x86_64.mk index 05d12963..bd7eca2a 100644 --- a/modules/neteq.target.linux-x86_64.mk +++ b/modules/neteq.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_neteq_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)) @@ -164,10 +165,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -290,10 +288,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -315,13 +310,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/modules/paced_sender.target.darwin-arm.mk b/modules/paced_sender.target.darwin-arm.mk index a88e0270..a07debe2 100644 --- a/modules/paced_sender.target.darwin-arm.mk +++ b/modules/paced_sender.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/paced_sender.target.darwin-arm64.mk b/modules/paced_sender.target.darwin-arm64.mk index 74b3fa4d..97670e57 100644 --- a/modules/paced_sender.target.darwin-arm64.mk +++ b/modules/paced_sender.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/paced_sender.target.darwin-mips.mk b/modules/paced_sender.target.darwin-mips.mk index 8d1f07e8..7cd05480 100644 --- a/modules/paced_sender.target.darwin-mips.mk +++ b/modules/paced_sender.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/paced_sender.target.darwin-x86.mk b/modules/paced_sender.target.darwin-x86.mk index 8b572a34..1252a0ce 100644 --- a/modules/paced_sender.target.darwin-x86.mk +++ b/modules/paced_sender.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/paced_sender.target.darwin-x86_64.mk b/modules/paced_sender.target.darwin-x86_64.mk index 389ce545..51b98aad 100644 --- a/modules/paced_sender.target.darwin-x86_64.mk +++ b/modules/paced_sender.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/paced_sender.target.linux-arm.mk b/modules/paced_sender.target.linux-arm.mk index a88e0270..a07debe2 100644 --- a/modules/paced_sender.target.linux-arm.mk +++ b/modules/paced_sender.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/paced_sender.target.linux-arm64.mk b/modules/paced_sender.target.linux-arm64.mk index 74b3fa4d..97670e57 100644 --- a/modules/paced_sender.target.linux-arm64.mk +++ b/modules/paced_sender.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/paced_sender.target.linux-mips.mk b/modules/paced_sender.target.linux-mips.mk index 8d1f07e8..7cd05480 100644 --- a/modules/paced_sender.target.linux-mips.mk +++ b/modules/paced_sender.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/paced_sender.target.linux-x86.mk b/modules/paced_sender.target.linux-x86.mk index 8b572a34..1252a0ce 100644 --- a/modules/paced_sender.target.linux-x86.mk +++ b/modules/paced_sender.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/paced_sender.target.linux-x86_64.mk b/modules/paced_sender.target.linux-x86_64.mk index 389ce545..51b98aad 100644 --- a/modules/paced_sender.target.linux-x86_64.mk +++ b/modules/paced_sender.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_paced_sender_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/remote_bitrate_estimator.target.darwin-arm.mk b/modules/remote_bitrate_estimator.target.darwin-arm.mk index 9bd93b6b..4c975a37 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/remote_bitrate_estimator.target.darwin-arm64.mk b/modules/remote_bitrate_estimator.target.darwin-arm64.mk index 30eb4862..ae8b08af 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/remote_bitrate_estimator.target.darwin-mips.mk b/modules/remote_bitrate_estimator.target.darwin-mips.mk index 6be0a578..c51eef55 100644 --- a/modules/remote_bitrate_estimator.target.darwin-mips.mk +++ b/modules/remote_bitrate_estimator.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/remote_bitrate_estimator.target.darwin-x86.mk b/modules/remote_bitrate_estimator.target.darwin-x86.mk index d93be557..d5dad202 100644 --- a/modules/remote_bitrate_estimator.target.darwin-x86.mk +++ b/modules/remote_bitrate_estimator.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/remote_bitrate_estimator.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk index 2e36f654..6e65f9f2 100644 --- a/modules/remote_bitrate_estimator.target.darwin-x86_64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/remote_bitrate_estimator.target.linux-arm.mk b/modules/remote_bitrate_estimator.target.linux-arm.mk index 9bd93b6b..4c975a37 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/remote_bitrate_estimator.target.linux-arm64.mk b/modules/remote_bitrate_estimator.target.linux-arm64.mk index 30eb4862..ae8b08af 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm64.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/remote_bitrate_estimator.target.linux-mips.mk b/modules/remote_bitrate_estimator.target.linux-mips.mk index 6be0a578..c51eef55 100644 --- a/modules/remote_bitrate_estimator.target.linux-mips.mk +++ b/modules/remote_bitrate_estimator.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/remote_bitrate_estimator.target.linux-x86.mk b/modules/remote_bitrate_estimator.target.linux-x86.mk index d93be557..d5dad202 100644 --- a/modules/remote_bitrate_estimator.target.linux-x86.mk +++ b/modules/remote_bitrate_estimator.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/remote_bitrate_estimator.target.linux-x86_64.mk b/modules/remote_bitrate_estimator.target.linux-x86_64.mk index 2e36f654..6e65f9f2 100644 --- a/modules/remote_bitrate_estimator.target.linux-x86_64.mk +++ b/modules/remote_bitrate_estimator.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk index 19b659a2..9f33dcbd 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -123,10 +124,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. @@ -239,10 +237,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. @@ -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/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk index cddda861..bb6cc81a 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -109,10 +110,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. @@ -210,10 +208,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. @@ -235,13 +230,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/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk index 1e8010a8..2e06294b 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -115,10 +116,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. @@ -223,10 +221,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. @@ -249,13 +244,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/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk index eb7c27f5..30f78cb6 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -115,10 +116,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. @@ -222,10 +220,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. @@ -247,13 +242,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/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk index aeffddd2..977c9eae 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -114,10 +115,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. @@ -245,13 +240,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/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk index 19b659a2..9f33dcbd 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -123,10 +124,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. @@ -239,10 +237,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. @@ -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/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk index cddda861..bb6cc81a 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -109,10 +110,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. @@ -210,10 +208,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. @@ -235,13 +230,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/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk index 1e8010a8..2e06294b 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -115,10 +116,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. @@ -223,10 +221,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. @@ -249,13 +244,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/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk index eb7c27f5..30f78cb6 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -115,10 +116,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. @@ -222,10 +220,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. @@ -247,13 +242,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/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk index aeffddd2..977c9eae 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_remote_bitrate_estimator_rbe_components_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)) @@ -114,10 +115,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. @@ -245,13 +240,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/modules/rtp_rtcp.target.darwin-arm.mk b/modules/rtp_rtcp.target.darwin-arm.mk index ff3818d2..4f8b4906 100644 --- a/modules/rtp_rtcp.target.darwin-arm.mk +++ b/modules/rtp_rtcp.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -158,10 +159,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -305,13 +300,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/modules/rtp_rtcp.target.darwin-arm64.mk b/modules/rtp_rtcp.target.darwin-arm64.mk index 5cbcd028..06327cff 100644 --- a/modules/rtp_rtcp.target.darwin-arm64.mk +++ b/modules/rtp_rtcp.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -250,10 +248,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -275,13 +270,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/modules/rtp_rtcp.target.darwin-mips.mk b/modules/rtp_rtcp.target.darwin-mips.mk index 1c6975c9..2517dbdc 100644 --- a/modules/rtp_rtcp.target.darwin-mips.mk +++ b/modules/rtp_rtcp.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -151,10 +152,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -291,13 +286,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/modules/rtp_rtcp.target.darwin-x86.mk b/modules/rtp_rtcp.target.darwin-x86.mk index ac5c8de1..930875ee 100644 --- a/modules/rtp_rtcp.target.darwin-x86.mk +++ b/modules/rtp_rtcp.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -287,13 +282,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/modules/rtp_rtcp.target.darwin-x86_64.mk b/modules/rtp_rtcp.target.darwin-x86_64.mk index 067f5126..82bb13ab 100644 --- a/modules/rtp_rtcp.target.darwin-x86_64.mk +++ b/modules/rtp_rtcp.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -260,10 +258,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -285,13 +280,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/modules/rtp_rtcp.target.linux-arm.mk b/modules/rtp_rtcp.target.linux-arm.mk index ff3818d2..4f8b4906 100644 --- a/modules/rtp_rtcp.target.linux-arm.mk +++ b/modules/rtp_rtcp.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -158,10 +159,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,10 +277,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -305,13 +300,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/modules/rtp_rtcp.target.linux-arm64.mk b/modules/rtp_rtcp.target.linux-arm64.mk index 5cbcd028..06327cff 100644 --- a/modules/rtp_rtcp.target.linux-arm64.mk +++ b/modules/rtp_rtcp.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -250,10 +248,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -275,13 +270,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/modules/rtp_rtcp.target.linux-mips.mk b/modules/rtp_rtcp.target.linux-mips.mk index 1c6975c9..2517dbdc 100644 --- a/modules/rtp_rtcp.target.linux-mips.mk +++ b/modules/rtp_rtcp.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -151,10 +152,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -291,13 +286,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/modules/rtp_rtcp.target.linux-x86.mk b/modules/rtp_rtcp.target.linux-x86.mk index ac5c8de1..930875ee 100644 --- a/modules/rtp_rtcp.target.linux-x86.mk +++ b/modules/rtp_rtcp.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -287,13 +282,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/modules/rtp_rtcp.target.linux-x86_64.mk b/modules/rtp_rtcp.target.linux-x86_64.mk index 067f5126..82bb13ab 100644 --- a/modules/rtp_rtcp.target.linux-x86_64.mk +++ b/modules/rtp_rtcp.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_rtp_rtcp_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)) @@ -149,10 +150,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -260,10 +258,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -285,13 +280,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/modules/video_capture_module.target.darwin-arm.mk b/modules/video_capture_module.target.darwin-arm.mk index f56091cd..4e67ff87 100644 --- a/modules/video_capture_module.target.darwin-arm.mk +++ b/modules/video_capture_module.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/video_capture_module.target.darwin-arm64.mk b/modules/video_capture_module.target.darwin-arm64.mk index 14d53627..02067278 100644 --- a/modules/video_capture_module.target.darwin-arm64.mk +++ b/modules/video_capture_module.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -249,13 +244,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/modules/video_capture_module.target.darwin-mips.mk b/modules/video_capture_module.target.darwin-mips.mk index cdfb5bc5..8f90db1a 100644 --- a/modules/video_capture_module.target.darwin-mips.mk +++ b/modules/video_capture_module.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_capture_module.target.darwin-x86.mk b/modules/video_capture_module.target.darwin-x86.mk index aeda65a8..420f47fb 100644 --- a/modules/video_capture_module.target.darwin-x86.mk +++ b/modules/video_capture_module.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_capture_module.target.darwin-x86_64.mk b/modules/video_capture_module.target.darwin-x86_64.mk index 6e65ad5b..882ff1ff 100644 --- a/modules/video_capture_module.target.darwin-x86_64.mk +++ b/modules/video_capture_module.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,13 +254,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/modules/video_capture_module.target.linux-arm.mk b/modules/video_capture_module.target.linux-arm.mk index f56091cd..4e67ff87 100644 --- a/modules/video_capture_module.target.linux-arm.mk +++ b/modules/video_capture_module.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/video_capture_module.target.linux-arm64.mk b/modules/video_capture_module.target.linux-arm64.mk index 14d53627..02067278 100644 --- a/modules/video_capture_module.target.linux-arm64.mk +++ b/modules/video_capture_module.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -249,13 +244,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/modules/video_capture_module.target.linux-mips.mk b/modules/video_capture_module.target.linux-mips.mk index cdfb5bc5..8f90db1a 100644 --- a/modules/video_capture_module.target.linux-mips.mk +++ b/modules/video_capture_module.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_capture_module.target.linux-x86.mk b/modules/video_capture_module.target.linux-x86.mk index aeda65a8..420f47fb 100644 --- a/modules/video_capture_module.target.linux-x86.mk +++ b/modules/video_capture_module.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_capture_module.target.linux-x86_64.mk b/modules/video_capture_module.target.linux-x86_64.mk index 6e65ad5b..882ff1ff 100644 --- a/modules/video_capture_module.target.linux-x86_64.mk +++ b/modules/video_capture_module.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,13 +254,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/modules/video_capture_module_impl.target.darwin-arm.mk b/modules/video_capture_module_impl.target.darwin-arm.mk index 2c03f2eb..050e8941 100644 --- a/modules/video_capture_module_impl.target.darwin-arm.mk +++ b/modules/video_capture_module_impl.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -126,10 +127,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. @@ -246,10 +244,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. @@ -272,13 +267,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/modules/video_capture_module_impl.target.darwin-arm64.mk b/modules/video_capture_module_impl.target.darwin-arm64.mk index 0d4b15f8..26198ccc 100644 --- a/modules/video_capture_module_impl.target.darwin-arm64.mk +++ b/modules/video_capture_module_impl.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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. @@ -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. @@ -242,13 +237,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/modules/video_capture_module_impl.target.darwin-mips.mk b/modules/video_capture_module_impl.target.darwin-mips.mk index fd66ef09..6562d19b 100644 --- a/modules/video_capture_module_impl.target.darwin-mips.mk +++ b/modules/video_capture_module_impl.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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 := \ $(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. @@ -232,10 +230,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. @@ -258,13 +253,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/modules/video_capture_module_impl.target.darwin-x86.mk b/modules/video_capture_module_impl.target.darwin-x86.mk index 3dd51492..6be87a83 100644 --- a/modules/video_capture_module_impl.target.darwin-x86.mk +++ b/modules/video_capture_module_impl.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -118,10 +119,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. @@ -229,10 +227,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. @@ -254,13 +249,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/modules/video_capture_module_impl.target.darwin-x86_64.mk b/modules/video_capture_module_impl.target.darwin-x86_64.mk index 33d05345..c1d08183 100644 --- a/modules/video_capture_module_impl.target.darwin-x86_64.mk +++ b/modules/video_capture_module_impl.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -117,10 +118,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. @@ -227,10 +225,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_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/modules/video_capture_module_impl.target.linux-arm.mk b/modules/video_capture_module_impl.target.linux-arm.mk index 2c03f2eb..050e8941 100644 --- a/modules/video_capture_module_impl.target.linux-arm.mk +++ b/modules/video_capture_module_impl.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -126,10 +127,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. @@ -246,10 +244,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. @@ -272,13 +267,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/modules/video_capture_module_impl.target.linux-arm64.mk b/modules/video_capture_module_impl.target.linux-arm64.mk index 0d4b15f8..26198ccc 100644 --- a/modules/video_capture_module_impl.target.linux-arm64.mk +++ b/modules/video_capture_module_impl.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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. @@ -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. @@ -242,13 +237,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/modules/video_capture_module_impl.target.linux-mips.mk b/modules/video_capture_module_impl.target.linux-mips.mk index fd66ef09..6562d19b 100644 --- a/modules/video_capture_module_impl.target.linux-mips.mk +++ b/modules/video_capture_module_impl.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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 := \ $(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. @@ -232,10 +230,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. @@ -258,13 +253,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/modules/video_capture_module_impl.target.linux-x86.mk b/modules/video_capture_module_impl.target.linux-x86.mk index 3dd51492..6be87a83 100644 --- a/modules/video_capture_module_impl.target.linux-x86.mk +++ b/modules/video_capture_module_impl.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -118,10 +119,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. @@ -229,10 +227,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. @@ -254,13 +249,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/modules/video_capture_module_impl.target.linux-x86_64.mk b/modules/video_capture_module_impl.target.linux-x86_64.mk index 33d05345..c1d08183 100644 --- a/modules/video_capture_module_impl.target.linux-x86_64.mk +++ b/modules/video_capture_module_impl.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_capture_module_impl_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)) @@ -117,10 +118,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. @@ -227,10 +225,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_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/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk index 999c242d..17714395 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -129,10 +130,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -249,10 +247,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -275,13 +270,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk index 0caaf072..65e5c569 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -245,13 +240,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk index 545e51c1..dd2b3dc8 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -259,13 +254,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk index 6b43f8c3..ded85c00 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -232,10 +230,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -257,13 +252,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk index 28eae769..adbde710 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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 := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk index 999c242d..17714395 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -129,10 +130,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -249,10 +247,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -275,13 +270,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk index 0caaf072..65e5c569 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -220,10 +218,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -245,13 +240,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk index 545e51c1..dd2b3dc8 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -259,13 +254,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk index 6b43f8c3..ded85c00 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -232,10 +230,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -257,13 +252,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/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk index 28eae769..adbde710 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp8_webrtc_vp8_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 := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm.mk index 7c17221a..3d9487d4 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -245,10 +243,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -271,13 +266,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm64.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm64.mk index 2099e573..865331c4 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm64.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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 := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -216,10 +214,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -241,13 +236,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-mips.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-mips.mk index abbc601b..fa039d1d 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-mips.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86.mk index dec62f6d..2e6e9f22 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -253,13 +248,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86_64.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86_64.mk index 7962e75c..7c9ccee7 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86_64.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # 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/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm.mk index 7c17221a..3d9487d4 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -245,10 +243,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -271,13 +266,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm64.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm64.mk index 2099e573..865331c4 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm64.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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 := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -216,10 +214,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -241,13 +236,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-mips.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-mips.mk index abbc601b..fa039d1d 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-mips.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -255,13 +250,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86.mk index dec62f6d..2e6e9f22 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -253,13 +248,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/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86_64.mk b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86_64.mk index 7962e75c..7c9ccee7 100644 --- a/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86_64.mk +++ b/modules/video_coding/codecs/vp9/webrtc_vp9.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_codecs_vp9_webrtc_vp9_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/libvpx/source/libvpx # 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/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk index f1f59f1e..6c01d53e 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -240,10 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -266,13 +261,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/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk index 09a9606e..0f5f9924 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -109,10 +110,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -211,10 +209,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -236,13 +231,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/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk index 3b906a20..05f1f0b2 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -250,13 +245,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/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk index 6f4f76e9..900dd215 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -223,10 +221,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -248,13 +243,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/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk index 3fa45881..cdf9f21f 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -114,10 +115,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -221,10 +219,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -246,13 +241,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/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk index f1f59f1e..6c01d53e 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -240,10 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -266,13 +261,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/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk index 09a9606e..0f5f9924 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -109,10 +110,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -211,10 +209,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -236,13 +231,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/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk index 3b906a20..05f1f0b2 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -250,13 +245,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/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk index 6f4f76e9..900dd215 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -115,10 +116,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -223,10 +221,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -248,13 +243,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/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk index 3fa45881..cdf9f21f 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_coding_utility_video_coding_utility_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)) @@ -114,10 +115,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -221,10 +219,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -246,13 +241,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/modules/video_processing.target.darwin-arm.mk b/modules/video_processing.target.darwin-arm.mk index 216dc193..3a3f9ede 100644 --- a/modules/video_processing.target.darwin-arm.mk +++ b/modules/video_processing.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -291,13 +286,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/modules/video_processing.target.darwin-arm64.mk b/modules/video_processing.target.darwin-arm64.mk index 48d854e7..680be506 100644 --- a/modules/video_processing.target.darwin-arm64.mk +++ b/modules/video_processing.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_processing.target.darwin-mips.mk b/modules/video_processing.target.darwin-mips.mk index 8f1368d5..d9e039db 100644 --- a/modules/video_processing.target.darwin-mips.mk +++ b/modules/video_processing.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -132,10 +133,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -251,10 +249,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -277,13 +272,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/modules/video_processing.target.darwin-x86.mk b/modules/video_processing.target.darwin-x86.mk index ca458e63..374a2867 100644 --- a/modules/video_processing.target.darwin-x86.mk +++ b/modules/video_processing.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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,13 +268,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/modules/video_processing.target.darwin-x86_64.mk b/modules/video_processing.target.darwin-x86_64.mk index eb5c346a..4953ad14 100644 --- a/modules/video_processing.target.darwin-x86_64.mk +++ b/modules/video_processing.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -246,10 +244,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -271,13 +266,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/modules/video_processing.target.linux-arm.mk b/modules/video_processing.target.linux-arm.mk index 216dc193..3a3f9ede 100644 --- a/modules/video_processing.target.linux-arm.mk +++ b/modules/video_processing.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -291,13 +286,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/modules/video_processing.target.linux-arm64.mk b/modules/video_processing.target.linux-arm64.mk index 48d854e7..680be506 100644 --- a/modules/video_processing.target.linux-arm64.mk +++ b/modules/video_processing.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_processing.target.linux-mips.mk b/modules/video_processing.target.linux-mips.mk index 8f1368d5..d9e039db 100644 --- a/modules/video_processing.target.linux-mips.mk +++ b/modules/video_processing.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -132,10 +133,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -251,10 +249,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -277,13 +272,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/modules/video_processing.target.linux-x86.mk b/modules/video_processing.target.linux-x86.mk index ca458e63..374a2867 100644 --- a/modules/video_processing.target.linux-x86.mk +++ b/modules/video_processing.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -131,10 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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,13 +268,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/modules/video_processing.target.linux-x86_64.mk b/modules/video_processing.target.linux-x86_64.mk index eb5c346a..4953ad14 100644 --- a/modules/video_processing.target.linux-x86_64.mk +++ b/modules/video_processing.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -246,10 +244,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -271,13 +266,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/modules/video_processing_sse2.target.darwin-x86.mk b/modules/video_processing_sse2.target.darwin-x86.mk index 14e255d7..412ccf16 100644 --- a/modules/video_processing_sse2.target.darwin-x86.mk +++ b/modules/video_processing_sse2.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_sse2_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)) @@ -118,10 +119,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. @@ -230,10 +228,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. @@ -255,13 +250,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/modules/video_processing_sse2.target.darwin-x86_64.mk b/modules/video_processing_sse2.target.darwin-x86_64.mk index 2425a20a..010ef348 100644 --- a/modules/video_processing_sse2.target.darwin-x86_64.mk +++ b/modules/video_processing_sse2.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_sse2_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/video_processing_sse2.target.linux-x86.mk b/modules/video_processing_sse2.target.linux-x86.mk index 14e255d7..412ccf16 100644 --- a/modules/video_processing_sse2.target.linux-x86.mk +++ b/modules/video_processing_sse2.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_sse2_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)) @@ -118,10 +119,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. @@ -230,10 +228,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. @@ -255,13 +250,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/modules/video_processing_sse2.target.linux-x86_64.mk b/modules/video_processing_sse2.target.linux-x86_64.mk index 2425a20a..010ef348 100644 --- a/modules/video_processing_sse2.target.linux-x86_64.mk +++ b/modules/video_processing_sse2.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_processing_sse2_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/video_render_module.target.darwin-arm.mk b/modules/video_render_module.target.darwin-arm.mk index 0e4865ab..001ceac8 100644 --- a/modules/video_render_module.target.darwin-arm.mk +++ b/modules/video_render_module.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/video_render_module.target.darwin-arm64.mk b/modules/video_render_module.target.darwin-arm64.mk index f4c2f227..2859c9c2 100644 --- a/modules/video_render_module.target.darwin-arm64.mk +++ b/modules/video_render_module.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -249,13 +244,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/modules/video_render_module.target.darwin-mips.mk b/modules/video_render_module.target.darwin-mips.mk index becdb514..1653fe24 100644 --- a/modules/video_render_module.target.darwin-mips.mk +++ b/modules/video_render_module.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_render_module.target.darwin-x86.mk b/modules/video_render_module.target.darwin-x86.mk index c5c3cd4f..b4386080 100644 --- a/modules/video_render_module.target.darwin-x86.mk +++ b/modules/video_render_module.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_render_module.target.darwin-x86_64.mk b/modules/video_render_module.target.darwin-x86_64.mk index 8c699aa0..0a90ed59 100644 --- a/modules/video_render_module.target.darwin-x86_64.mk +++ b/modules/video_render_module.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,13 +254,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/modules/video_render_module.target.linux-arm.mk b/modules/video_render_module.target.linux-arm.mk index 0e4865ab..001ceac8 100644 --- a/modules/video_render_module.target.linux-arm.mk +++ b/modules/video_render_module.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -130,10 +131,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/video_render_module.target.linux-arm64.mk b/modules/video_render_module.target.linux-arm64.mk index f4c2f227..2859c9c2 100644 --- a/modules/video_render_module.target.linux-arm64.mk +++ b/modules/video_render_module.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -116,10 +117,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -224,10 +222,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -249,13 +244,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/modules/video_render_module.target.linux-mips.mk b/modules/video_render_module.target.linux-mips.mk index becdb514..1653fe24 100644 --- a/modules/video_render_module.target.linux-mips.mk +++ b/modules/video_render_module.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -123,10 +124,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -239,10 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_render_module.target.linux-x86.mk b/modules/video_render_module.target.linux-x86.mk index c5c3cd4f..b4386080 100644 --- a/modules/video_render_module.target.linux-x86.mk +++ b/modules/video_render_module.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -122,10 +123,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -236,10 +234,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -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/modules/video_render_module.target.linux-x86_64.mk b/modules/video_render_module.target.linux-x86_64.mk index 8c699aa0..0a90ed59 100644 --- a/modules/video_render_module.target.linux-x86_64.mk +++ b/modules/video_render_module.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_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)) @@ -121,10 +122,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,13 +254,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/modules/video_render_module_impl.target.darwin-arm.mk b/modules/video_render_module_impl.target.darwin-arm.mk index b9717fd7..e8b7daea 100644 --- a/modules/video_render_module_impl.target.darwin-arm.mk +++ b/modules/video_render_module_impl.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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 := \ $(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. @@ -245,10 +243,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. @@ -271,13 +266,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/modules/video_render_module_impl.target.darwin-arm64.mk b/modules/video_render_module_impl.target.darwin-arm64.mk index 0a8f1df3..0b6a7033 100644 --- a/modules/video_render_module_impl.target.darwin-arm64.mk +++ b/modules/video_render_module_impl.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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. @@ -216,10 +214,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. @@ -241,13 +236,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/modules/video_render_module_impl.target.darwin-mips.mk b/modules/video_render_module_impl.target.darwin-mips.mk index e23e66ef..6c1b597b 100644 --- a/modules/video_render_module_impl.target.darwin-mips.mk +++ b/modules/video_render_module_impl.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -118,10 +119,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. @@ -231,10 +229,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. @@ -257,13 +252,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/modules/video_render_module_impl.target.darwin-x86.mk b/modules/video_render_module_impl.target.darwin-x86.mk index 9e9655fe..791629f1 100644 --- a/modules/video_render_module_impl.target.darwin-x86.mk +++ b/modules/video_render_module_impl.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/video_render_module_impl.target.darwin-x86_64.mk b/modules/video_render_module_impl.target.darwin-x86_64.mk index 4cdd7edb..972a01ba 100644 --- a/modules/video_render_module_impl.target.darwin-x86_64.mk +++ b/modules/video_render_module_impl.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -116,10 +117,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. @@ -226,10 +224,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. @@ -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/modules/video_render_module_impl.target.linux-arm.mk b/modules/video_render_module_impl.target.linux-arm.mk index b9717fd7..e8b7daea 100644 --- a/modules/video_render_module_impl.target.linux-arm.mk +++ b/modules/video_render_module_impl.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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 := \ $(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. @@ -245,10 +243,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. @@ -271,13 +266,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/modules/video_render_module_impl.target.linux-arm64.mk b/modules/video_render_module_impl.target.linux-arm64.mk index 0a8f1df3..0b6a7033 100644 --- a/modules/video_render_module_impl.target.linux-arm64.mk +++ b/modules/video_render_module_impl.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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. @@ -216,10 +214,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. @@ -241,13 +236,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/modules/video_render_module_impl.target.linux-mips.mk b/modules/video_render_module_impl.target.linux-mips.mk index e23e66ef..6c1b597b 100644 --- a/modules/video_render_module_impl.target.linux-mips.mk +++ b/modules/video_render_module_impl.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -118,10 +119,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. @@ -231,10 +229,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. @@ -257,13 +252,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/modules/video_render_module_impl.target.linux-x86.mk b/modules/video_render_module_impl.target.linux-x86.mk index 9e9655fe..791629f1 100644 --- a/modules/video_render_module_impl.target.linux-x86.mk +++ b/modules/video_render_module_impl.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -117,10 +118,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. @@ -228,10 +226,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. @@ -253,13 +248,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/modules/video_render_module_impl.target.linux-x86_64.mk b/modules/video_render_module_impl.target.linux-x86_64.mk index 4cdd7edb..972a01ba 100644 --- a/modules/video_render_module_impl.target.linux-x86_64.mk +++ b/modules/video_render_module_impl.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_video_render_module_impl_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)) @@ -116,10 +117,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. @@ -226,10 +224,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. @@ -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/modules/webrtc_i420.target.darwin-arm.mk b/modules/webrtc_i420.target.darwin-arm.mk index 5dbad470..a4e47eba 100644 --- a/modules/webrtc_i420.target.darwin-arm.mk +++ b/modules/webrtc_i420.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/webrtc_i420.target.darwin-arm64.mk b/modules/webrtc_i420.target.darwin-arm64.mk index a276bf0b..63f3f5c0 100644 --- a/modules/webrtc_i420.target.darwin-arm64.mk +++ b/modules/webrtc_i420.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/webrtc_i420.target.darwin-mips.mk b/modules/webrtc_i420.target.darwin-mips.mk index 53571cb0..39608cd6 100644 --- a/modules/webrtc_i420.target.darwin-mips.mk +++ b/modules/webrtc_i420.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/webrtc_i420.target.darwin-x86.mk b/modules/webrtc_i420.target.darwin-x86.mk index 6d334487..11b59261 100644 --- a/modules/webrtc_i420.target.darwin-x86.mk +++ b/modules/webrtc_i420.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/webrtc_i420.target.darwin-x86_64.mk b/modules/webrtc_i420.target.darwin-x86_64.mk index db966d66..452ab8e8 100644 --- a/modules/webrtc_i420.target.darwin-x86_64.mk +++ b/modules/webrtc_i420.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/webrtc_i420.target.linux-arm.mk b/modules/webrtc_i420.target.linux-arm.mk index 5dbad470..a4e47eba 100644 --- a/modules/webrtc_i420.target.linux-arm.mk +++ b/modules/webrtc_i420.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -247,10 +245,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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,13 +268,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/modules/webrtc_i420.target.linux-arm64.mk b/modules/webrtc_i420.target.linux-arm64.mk index a276bf0b..63f3f5c0 100644 --- a/modules/webrtc_i420.target.linux-arm64.mk +++ b/modules/webrtc_i420.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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 := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -218,10 +216,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -243,13 +238,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/modules/webrtc_i420.target.linux-mips.mk b/modules/webrtc_i420.target.linux-mips.mk index 53571cb0..39608cd6 100644 --- a/modules/webrtc_i420.target.linux-mips.mk +++ b/modules/webrtc_i420.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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/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. @@ -233,10 +231,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -259,13 +254,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/modules/webrtc_i420.target.linux-x86.mk b/modules/webrtc_i420.target.linux-x86.mk index 6d334487..11b59261 100644 --- a/modules/webrtc_i420.target.linux-x86.mk +++ b/modules/webrtc_i420.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -230,10 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -255,13 +250,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/modules/webrtc_i420.target.linux-x86_64.mk b/modules/webrtc_i420.target.linux-x86_64.mk index db966d66..452ab8e8 100644 --- a/modules/webrtc_i420.target.linux-x86_64.mk +++ b/modules/webrtc_i420.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_i420_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -228,10 +226,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ - $(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. @@ -253,13 +248,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/modules/webrtc_opus.target.darwin-arm.mk b/modules/webrtc_opus.target.darwin-arm.mk index 6beed32b..ed750b95 100644 --- a/modules/webrtc_opus.target.darwin-arm.mk +++ b/modules/webrtc_opus.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -274,13 +269,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/modules/webrtc_opus.target.darwin-arm64.mk b/modules/webrtc_opus.target.darwin-arm64.mk index 9e134a5b..36cc131a 100644 --- a/modules/webrtc_opus.target.darwin-arm64.mk +++ b/modules/webrtc_opus.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -244,13 +239,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/modules/webrtc_opus.target.darwin-mips.mk b/modules/webrtc_opus.target.darwin-mips.mk index 3c1c753b..9240c596 100644 --- a/modules/webrtc_opus.target.darwin-mips.mk +++ b/modules/webrtc_opus.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -260,13 +255,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/modules/webrtc_opus.target.darwin-x86.mk b/modules/webrtc_opus.target.darwin-x86.mk index 76cfdd7b..35be0380 100644 --- a/modules/webrtc_opus.target.darwin-x86.mk +++ b/modules/webrtc_opus.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/webrtc_opus.target.darwin-x86_64.mk b/modules/webrtc_opus.target.darwin-x86_64.mk index 30539257..625dc80d 100644 --- a/modules/webrtc_opus.target.darwin-x86_64.mk +++ b/modules/webrtc_opus.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -254,13 +249,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/modules/webrtc_opus.target.linux-arm.mk b/modules/webrtc_opus.target.linux-arm.mk index 6beed32b..ed750b95 100644 --- a/modules/webrtc_opus.target.linux-arm.mk +++ b/modules/webrtc_opus.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -126,10 +127,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -248,10 +246,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -274,13 +269,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/modules/webrtc_opus.target.linux-arm64.mk b/modules/webrtc_opus.target.linux-arm64.mk index 9e134a5b..36cc131a 100644 --- a/modules/webrtc_opus.target.linux-arm64.mk +++ b/modules/webrtc_opus.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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 := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -219,10 +217,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -244,13 +239,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/modules/webrtc_opus.target.linux-mips.mk b/modules/webrtc_opus.target.linux-mips.mk index 3c1c753b..9240c596 100644 --- a/modules/webrtc_opus.target.linux-mips.mk +++ b/modules/webrtc_opus.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -234,10 +232,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -260,13 +255,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/modules/webrtc_opus.target.linux-x86.mk b/modules/webrtc_opus.target.linux-x86.mk index 76cfdd7b..35be0380 100644 --- a/modules/webrtc_opus.target.linux-x86.mk +++ b/modules/webrtc_opus.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -118,10 +119,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -231,10 +229,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -256,13 +251,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/modules/webrtc_opus.target.linux-x86_64.mk b/modules/webrtc_opus.target.linux-x86_64.mk index 30539257..625dc80d 100644 --- a/modules/webrtc_opus.target.linux-x86_64.mk +++ b/modules/webrtc_opus.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_opus_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)) @@ -117,10 +118,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -229,10 +227,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/opus/src/include # Flags passed to only C++ (and not C) files. @@ -254,13 +249,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/modules/webrtc_utility.target.darwin-arm.mk b/modules/webrtc_utility.target.darwin-arm.mk index f0719ead..77fe6328 100644 --- a/modules/webrtc_utility.target.darwin-arm.mk +++ b/modules/webrtc_utility.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -270,10 +268,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -296,13 +291,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/modules/webrtc_utility.target.darwin-arm64.mk b/modules/webrtc_utility.target.darwin-arm64.mk index 9db78ca8..01f2d00c 100644 --- a/modules/webrtc_utility.target.darwin-arm64.mk +++ b/modules/webrtc_utility.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -128,10 +129,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -241,10 +239,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -266,13 +261,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/modules/webrtc_utility.target.darwin-mips.mk b/modules/webrtc_utility.target.darwin-mips.mk index cb9cb928..95077df8 100644 --- a/modules/webrtc_utility.target.darwin-mips.mk +++ b/modules/webrtc_utility.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -135,10 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -282,13 +277,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/modules/webrtc_utility.target.darwin-x86.mk b/modules/webrtc_utility.target.darwin-x86.mk index 02349ad3..28a6ac00 100644 --- a/modules/webrtc_utility.target.darwin-x86.mk +++ b/modules/webrtc_utility.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -134,10 +135,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -278,13 +273,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/modules/webrtc_utility.target.darwin-x86_64.mk b/modules/webrtc_utility.target.darwin-x86_64.mk index a2c98a36..52af2567 100644 --- a/modules/webrtc_utility.target.darwin-x86_64.mk +++ b/modules/webrtc_utility.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -251,10 +249,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -276,13 +271,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/modules/webrtc_utility.target.linux-arm.mk b/modules/webrtc_utility.target.linux-arm.mk index f0719ead..77fe6328 100644 --- a/modules/webrtc_utility.target.linux-arm.mk +++ b/modules/webrtc_utility.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -270,10 +268,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -296,13 +291,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/modules/webrtc_utility.target.linux-arm64.mk b/modules/webrtc_utility.target.linux-arm64.mk index 9db78ca8..01f2d00c 100644 --- a/modules/webrtc_utility.target.linux-arm64.mk +++ b/modules/webrtc_utility.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -128,10 +129,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -241,10 +239,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -266,13 +261,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/modules/webrtc_utility.target.linux-mips.mk b/modules/webrtc_utility.target.linux-mips.mk index cb9cb928..95077df8 100644 --- a/modules/webrtc_utility.target.linux-mips.mk +++ b/modules/webrtc_utility.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -135,10 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -282,13 +277,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/modules/webrtc_utility.target.linux-x86.mk b/modules/webrtc_utility.target.linux-x86.mk index 02349ad3..28a6ac00 100644 --- a/modules/webrtc_utility.target.linux-x86.mk +++ b/modules/webrtc_utility.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)) @@ -134,10 +135,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -278,13 +273,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/modules/webrtc_utility.target.linux-x86_64.mk b/modules/webrtc_utility.target.linux-x86_64.mk index a2c98a36..52af2567 100644 --- a/modules/webrtc_utility.target.linux-x86_64.mk +++ b/modules/webrtc_utility.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_utility_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)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -251,10 +249,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(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. @@ -276,13 +271,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/modules/webrtc_video_coding.target.darwin-arm.mk b/modules/webrtc_video_coding.target.darwin-arm.mk index 40e055d6..954e00f2 100644 --- a/modules/webrtc_video_coding.target.darwin-arm.mk +++ b/modules/webrtc_video_coding.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.darwin-arm64.mk b/modules/webrtc_video_coding.target.darwin-arm64.mk index 50d156da..e527a7af 100644 --- a/modules/webrtc_video_coding.target.darwin-arm64.mk +++ b/modules/webrtc_video_coding.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -136,10 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.darwin-mips.mk b/modules/webrtc_video_coding.target.darwin-mips.mk index 855dec24..0f83a209 100644 --- a/modules/webrtc_video_coding.target.darwin-mips.mk +++ b/modules/webrtc_video_coding.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -143,10 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,10 +257,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -285,13 +280,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/modules/webrtc_video_coding.target.darwin-x86.mk b/modules/webrtc_video_coding.target.darwin-x86.mk index 64513e76..5dd940aa 100644 --- a/modules/webrtc_video_coding.target.darwin-x86.mk +++ b/modules/webrtc_video_coding.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.darwin-x86_64.mk b/modules/webrtc_video_coding.target.darwin-x86_64.mk index 4ae9ad13..7c438d00 100644 --- a/modules/webrtc_video_coding.target.darwin-x86_64.mk +++ b/modules/webrtc_video_coding.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.linux-arm.mk b/modules/webrtc_video_coding.target.linux-arm.mk index 40e055d6..954e00f2 100644 --- a/modules/webrtc_video_coding.target.linux-arm.mk +++ b/modules/webrtc_video_coding.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -150,10 +151,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.linux-arm64.mk b/modules/webrtc_video_coding.target.linux-arm64.mk index 50d156da..e527a7af 100644 --- a/modules/webrtc_video_coding.target.linux-arm64.mk +++ b/modules/webrtc_video_coding.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -136,10 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.linux-mips.mk b/modules/webrtc_video_coding.target.linux-mips.mk index 855dec24..0f83a209 100644 --- a/modules/webrtc_video_coding.target.linux-mips.mk +++ b/modules/webrtc_video_coding.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -143,10 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -259,10 +257,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -285,13 +280,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/modules/webrtc_video_coding.target.linux-x86.mk b/modules/webrtc_video_coding.target.linux-x86.mk index 64513e76..5dd940aa 100644 --- a/modules/webrtc_video_coding.target.linux-x86.mk +++ b/modules/webrtc_video_coding.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -142,10 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/modules/webrtc_video_coding.target.linux-x86_64.mk b/modules/webrtc_video_coding.target.linux-x86_64.mk index 4ae9ad13..7c438d00 100644 --- a/modules/webrtc_video_coding.target.linux-x86_64.mk +++ b/modules/webrtc_video_coding.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_webrtc_video_coding_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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/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 diff --git a/video_engine/video_engine_core.target.darwin-arm.mk b/video_engine/video_engine_core.target.darwin-arm.mk index ffb67e6b..8d4d3776 100644 --- a/video_engine/video_engine_core.target.darwin-arm.mk +++ b/video_engine/video_engine_core.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -272,10 +270,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -298,13 +293,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/video_engine/video_engine_core.target.darwin-arm64.mk b/video_engine/video_engine_core.target.darwin-arm64.mk index 0a229171..12388fec 100644 --- a/video_engine/video_engine_core.target.darwin-arm64.mk +++ b/video_engine/video_engine_core.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -243,10 +241,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -268,13 +263,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/video_engine/video_engine_core.target.darwin-mips.mk b/video_engine/video_engine_core.target.darwin-mips.mk index 66568b4d..f0590345 100644 --- a/video_engine/video_engine_core.target.darwin-mips.mk +++ b/video_engine/video_engine_core.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -282,13 +277,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/video_engine/video_engine_core.target.darwin-x86.mk b/video_engine/video_engine_core.target.darwin-x86.mk index 84ac9486..5b3758fc 100644 --- a/video_engine/video_engine_core.target.darwin-x86.mk +++ b/video_engine/video_engine_core.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -280,13 +275,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/video_engine/video_engine_core.target.darwin-x86_64.mk b/video_engine/video_engine_core.target.darwin-x86_64.mk index da7d5867..4e8cebb9 100644 --- a/video_engine/video_engine_core.target.darwin-x86_64.mk +++ b/video_engine/video_engine_core.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -278,13 +273,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/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index ffb67e6b..8d4d3776 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -272,10 +270,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -298,13 +293,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/video_engine/video_engine_core.target.linux-arm64.mk b/video_engine/video_engine_core.target.linux-arm64.mk index 0a229171..12388fec 100644 --- a/video_engine/video_engine_core.target.linux-arm64.mk +++ b/video_engine/video_engine_core.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -243,10 +241,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -268,13 +263,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/video_engine/video_engine_core.target.linux-mips.mk b/video_engine/video_engine_core.target.linux-mips.mk index 66568b4d..f0590345 100644 --- a/video_engine/video_engine_core.target.linux-mips.mk +++ b/video_engine/video_engine_core.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -282,13 +277,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/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk index 84ac9486..5b3758fc 100644 --- a/video_engine/video_engine_core.target.linux-x86.mk +++ b/video_engine/video_engine_core.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -255,10 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -280,13 +275,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/video_engine/video_engine_core.target.linux-x86_64.mk b/video_engine/video_engine_core.target.linux-x86_64.mk index da7d5867..4e8cebb9 100644 --- a/video_engine/video_engine_core.target.linux-x86_64.mk +++ b/video_engine/video_engine_core.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_video_engine_video_engine_core_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 \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -253,10 +251,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/webrtc/common_video/interface \ $(LOCAL_PATH)/third_party/webrtc/common_video/libyuv/include \ - $(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. @@ -278,13 +273,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/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk index 714c7907..71d8c236 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -307,13 +302,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/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index 59965c5d..fde72238 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -277,13 +272,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/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index d8835e80..c9451737 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -291,13 +286,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/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk index dea8c668..ddf5f0bf 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -289,13 +284,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/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk index b366c85c..63b5c36f 100644 --- a/voice_engine/voice_engine.target.darwin-x86_64.mk +++ b/voice_engine/voice_engine.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -146,10 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -287,13 +282,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/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk index 714c7907..71d8c236 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -155,10 +156,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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,10 +279,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -307,13 +302,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/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index 59965c5d..fde72238 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -141,10 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -252,10 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -277,13 +272,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/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk index d8835e80..c9451737 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -265,10 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -291,13 +286,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/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk index dea8c668..ddf5f0bf 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -147,10 +148,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -264,10 +262,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -289,13 +284,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/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk index b366c85c..63b5c36f 100644 --- a/voice_engine/voice_engine.target.linux-x86_64.mk +++ b/voice_engine/voice_engine.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_voice_engine_voice_engine_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)) @@ -146,10 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -262,10 +260,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_device/include \ $(LOCAL_PATH)/third_party/webrtc/modules/media_file/interface \ - $(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. @@ -287,13 +282,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/webrtc.target.darwin-arm.mk b/webrtc.target.darwin-arm.mk index 89b48f70..5e587adb 100644 --- a/webrtc.target.darwin-arm.mk +++ b/webrtc.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -127,10 +128,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. @@ -243,10 +241,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. @@ -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/webrtc.target.darwin-arm64.mk b/webrtc.target.darwin-arm64.mk index ba6b0010..1edf35d9 100644 --- a/webrtc.target.darwin-arm64.mk +++ b/webrtc.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -113,10 +114,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. @@ -214,10 +212,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. @@ -239,13 +234,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/webrtc.target.darwin-mips.mk b/webrtc.target.darwin-mips.mk index 3c043b27..66d9e8ba 100644 --- a/webrtc.target.darwin-mips.mk +++ b/webrtc.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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 := \ $(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. @@ -227,10 +225,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. @@ -253,13 +248,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/webrtc.target.darwin-x86.mk b/webrtc.target.darwin-x86.mk index 1ed2f09f..fd54fed9 100644 --- a/webrtc.target.darwin-x86.mk +++ b/webrtc.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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 := \ $(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. @@ -226,10 +224,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. @@ -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/webrtc.target.darwin-x86_64.mk b/webrtc.target.darwin-x86_64.mk index b725b31f..27b9f5bb 100644 --- a/webrtc.target.darwin-x86_64.mk +++ b/webrtc.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -118,10 +119,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. @@ -224,10 +222,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. @@ -249,13 +244,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/webrtc.target.linux-arm.mk b/webrtc.target.linux-arm.mk index 89b48f70..5e587adb 100644 --- a/webrtc.target.linux-arm.mk +++ b/webrtc.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -127,10 +128,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. @@ -243,10 +241,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. @@ -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/webrtc.target.linux-arm64.mk b/webrtc.target.linux-arm64.mk index ba6b0010..1edf35d9 100644 --- a/webrtc.target.linux-arm64.mk +++ b/webrtc.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -113,10 +114,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. @@ -214,10 +212,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. @@ -239,13 +234,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/webrtc.target.linux-mips.mk b/webrtc.target.linux-mips.mk index 3c043b27..66d9e8ba 100644 --- a/webrtc.target.linux-mips.mk +++ b/webrtc.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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 := \ $(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. @@ -227,10 +225,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. @@ -253,13 +248,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/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk index 1ed2f09f..fd54fed9 100644 --- a/webrtc.target.linux-x86.mk +++ b/webrtc.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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 := \ $(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. @@ -226,10 +224,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. @@ -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/webrtc.target.linux-x86_64.mk b/webrtc.target.linux-x86_64.mk index b725b31f..27b9f5bb 100644 --- a/webrtc.target.linux-x86_64.mk +++ b/webrtc.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_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)) @@ -118,10 +119,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. @@ -224,10 +222,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. @@ -249,13 +244,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/webrtc_common.target.darwin-arm.mk b/webrtc_common.target.darwin-arm.mk index c8eba3c7..cbb6f4ff 100644 --- a/webrtc_common.target.darwin-arm.mk +++ b/webrtc_common.target.darwin-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -121,10 +122,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. @@ -237,10 +235,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. @@ -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/webrtc_common.target.darwin-arm64.mk b/webrtc_common.target.darwin-arm64.mk index 326b9c78..9a91fa20 100644 --- a/webrtc_common.target.darwin-arm64.mk +++ b/webrtc_common.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -107,10 +108,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. @@ -208,10 +206,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. @@ -233,13 +228,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/webrtc_common.target.darwin-mips.mk b/webrtc_common.target.darwin-mips.mk index cf90fea9..ec954990 100644 --- a/webrtc_common.target.darwin-mips.mk +++ b/webrtc_common.target.darwin-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -113,10 +114,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. @@ -221,10 +219,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. @@ -247,13 +242,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/webrtc_common.target.darwin-x86.mk b/webrtc_common.target.darwin-x86.mk index 53a6971a..e9f119fa 100644 --- a/webrtc_common.target.darwin-x86.mk +++ b/webrtc_common.target.darwin-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -113,10 +114,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. @@ -245,13 +240,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/webrtc_common.target.darwin-x86_64.mk b/webrtc_common.target.darwin-x86_64.mk index c089e7f6..4c98d462 100644 --- a/webrtc_common.target.darwin-x86_64.mk +++ b/webrtc_common.target.darwin-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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. @@ -218,10 +216,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. @@ -243,13 +238,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/webrtc_common.target.linux-arm.mk b/webrtc_common.target.linux-arm.mk index c8eba3c7..cbb6f4ff 100644 --- a/webrtc_common.target.linux-arm.mk +++ b/webrtc_common.target.linux-arm.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -121,10 +122,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. @@ -237,10 +235,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. @@ -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/webrtc_common.target.linux-arm64.mk b/webrtc_common.target.linux-arm64.mk index 326b9c78..9a91fa20 100644 --- a/webrtc_common.target.linux-arm64.mk +++ b/webrtc_common.target.linux-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -107,10 +108,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. @@ -208,10 +206,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. @@ -233,13 +228,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/webrtc_common.target.linux-mips.mk b/webrtc_common.target.linux-mips.mk index cf90fea9..ec954990 100644 --- a/webrtc_common.target.linux-mips.mk +++ b/webrtc_common.target.linux-mips.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -113,10 +114,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. @@ -221,10 +219,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. @@ -247,13 +242,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/webrtc_common.target.linux-x86.mk b/webrtc_common.target.linux-x86.mk index 53a6971a..e9f119fa 100644 --- a/webrtc_common.target.linux-x86.mk +++ b/webrtc_common.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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)) @@ -113,10 +114,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. @@ -245,13 +240,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/webrtc_common.target.linux-x86_64.mk b/webrtc_common.target.linux-x86_64.mk index c089e7f6..4c98d462 100644 --- a/webrtc_common.target.linux-x86_64.mk +++ b/webrtc_common.target.linux-x86_64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_webrtc_common_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. @@ -218,10 +216,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. @@ -243,13 +238,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 |