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 /video_engine | |
parent | c34187f7b7dd48bd316bebad20b05a4a8fd4503b (diff) | |
download | webrtc-e4b7614422621dbf83825717f5fe06b21a53fd3d.tar.gz |
Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: Ib4f1a99ca57b985be94ad5094d09418dc048e66a
Diffstat (limited to 'video_engine')
10 files changed, 40 insertions, 130 deletions
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 |