From e4b7614422621dbf83825717f5fe06b21a53fd3d Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Sun, 19 Oct 2014 22:50:11 +0000 Subject: Update makefiles after merge of Chromium at 89b463ddd92b This commit was generated by merge_from_chromium.py. Change-Id: Ib4f1a99ca57b985be94ad5094d09418dc048e66a --- .../source/cpu_features_android.target.darwin-x86_64.mk | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk') 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 -- cgit v1.2.3