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 /modules/audioproc_debug_proto.target.darwin-mips.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 'modules/audioproc_debug_proto.target.darwin-mips.mk')
| -rw-r--r-- | modules/audioproc_debug_proto.target.darwin-mips.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/audioproc_debug_proto.target.darwin-mips.mk b/modules/audioproc_debug_proto.target.darwin-mips.mk index 6d20c3c6..98d5cfcb 100644 --- a/modules/audioproc_debug_proto.target.darwin-mips.mk +++ b/modules/audioproc_debug_proto.target.darwin-mips.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_webrtc_modules_audioproc_debug_proto_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 := \ @@ -25,10 +26,7 @@ $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py: $(L $(gyp_shared_intermediate_dir)/protoc_out/webrtc/audio_processing/debug.pb.cc: $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py ; $(gyp_shared_intermediate_dir)/protoc_out/webrtc/audio_processing/debug.pb.h: $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py ; -.PHONY: third_party_webrtc_modules_audioproc_debug_proto_gyp_rule_trigger -third_party_webrtc_modules_audioproc_debug_proto_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py -### Finished generating for all rules GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py \ @@ -44,8 +42,7 @@ $(gyp_intermediate_dir)/debug.pb.cc: $(gyp_shared_intermediate_dir)/protoc_out/w LOCAL_GENERATED_SOURCES := \ $(gyp_intermediate_dir)/debug.pb.cc \ $(gyp_shared_intermediate_dir)/pyproto/webrtc/audio_processing/debug_pb2.py \ - $(gyp_shared_intermediate_dir)/protoc_out/webrtc/audio_processing/debug.pb.h \ - third_party_webrtc_modules_audioproc_debug_proto_gyp_rule_trigger + $(gyp_shared_intermediate_dir)/protoc_out/webrtc/audio_processing/debug.pb.h GYP_COPIED_SOURCE_ORIGIN_DIRS := \ $(gyp_shared_intermediate_dir)/protoc_out/webrtc/audio_processing |