diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:40 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:40 +0000 |
| commit | c71dd0dcd9ff4ccf721127f79fd9a41cee6b13ce (patch) | |
| tree | ba376e96ec095d59973939752e68dd4bbd3f26ef /system_wrappers/source/cpu_features_android.target.linux-arm.mk | |
| parent | ab63ca0e261973e04f36ea69d7d4f4712db33b7b (diff) | |
| download | webrtc-c71dd0dcd9ff4ccf721127f79fd9a41cee6b13ce.tar.gz | |
Update makefiles after merge of Chromium at 262754
This commit was generated by merge_from_chromium.py.
Change-Id: I354903dccf62f6b7d2bc87116fb6b5a126fe7613
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
| -rw-r--r-- | system_wrappers/source/cpu_features_android.target.linux-arm.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 9495cda6..6fbff357 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_system_wrappers_source_cpu_features_android_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := |