diff options
Diffstat (limited to 'modules/webrtc_video_coding.target.linux-arm.mk')
-rw-r--r-- | modules/webrtc_video_coding.target.linux-arm.mk | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/modules/webrtc_video_coding.target.linux-arm.mk b/modules/webrtc_video_coding.target.linux-arm.mk index 07b42b9d..9beb0566 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 := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -114,12 +115,6 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ - '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ - '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ - '-DDATA_REDUCTION_DEV_FALLBACK_HOST="http://proxy-dev.googlezip.net:80/"' \ - '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ - '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ - '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ @@ -156,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. @@ -242,12 +234,6 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ - '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ - '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ - '-DDATA_REDUCTION_DEV_FALLBACK_HOST="http://proxy-dev.googlezip.net:80/"' \ - '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ - '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ - '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ @@ -285,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. @@ -311,10 +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 |