Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
diff --git a/net/certificate_mime_types_java.target.darwin-arm.mk b/net/certificate_mime_types_java.target.darwin-arm.mk
index 554ec53..dc1d144 100644
--- a/net/certificate_mime_types_java.target.darwin-arm.mk
+++ b/net/certificate_mime_types_java.target.darwin-arm.mk
@@ -7,8 +7,9 @@
LOCAL_MODULE_STEM := certificate_mime_types_java
LOCAL_MODULE_SUFFIX := .stamp
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 :=
@@ -23,10 +24,7 @@
$(gyp_shared_intermediate_dir)/templates/org/chromium/net/CertificateMimeType.java: $(LOCAL_PATH)/net/android/java/CertificateMimeType.template $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/gcc_preprocess.py $(LOCAL_PATH)/net/base/mime_util_certificate_type_list.h $(GYP_TARGET_DEPENDENCIES)
mkdir -p $(gyp_shared_intermediate_dir)/templates/org/chromium/net; cd $(gyp_local_path)/net; python ../build/android/gyp/gcc_preprocess.py "--include-path=.." "--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/net/CertificateMimeType.java" "--template=android/java/CertificateMimeType.template"
-.PHONY: net_certificate_mime_types_java_gyp_rule_trigger
-net_certificate_mime_types_java_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/templates/org/chromium/net/CertificateMimeType.java
-### Finished generating for all rules
GYP_GENERATED_OUTPUTS := \
$(gyp_shared_intermediate_dir)/templates/org/chromium/net/CertificateMimeType.java
@@ -34,8 +32,7 @@
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-LOCAL_GENERATED_SOURCES := \
- net_certificate_mime_types_java_gyp_rule_trigger
+LOCAL_GENERATED_SOURCES :=
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
@@ -226,6 +223,7 @@
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
include $(BUILD_SYSTEM)/base_rules.mk
@@ -233,3 +231,5 @@
$(hide) echo "Gyp timestamp: $@"
$(hide) mkdir -p $(dir $@)
$(hide) touch $@
+
+LOCAL_2ND_ARCH_VAR_PREFIX :=