android_webview: Remove TARGET_2ND_ARCH hack from makefiles.

Chromium is no longer 64-bit blacklisted in AOSP and so it's now fine
for Java build targets in the Android makefiles to depend on the primary
architecture version of gyp-generated targets.

BUG=358141
R=mkosiba@chromium.org

Review URL: https://codereview.chromium.org/368203003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281274 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 23 insertions, 27 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 32e7654..680ebdc 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -40,7 +40,7 @@ LOCAL_MODULE_TAGS := optional
 # Depend on the android_webview_strings target to ensure the grd->string.xml
 # processing takes place.
 LOCAL_ADDITIONAL_DEPENDENCIES := \
-    $(call intermediates-dir-for,GYP,android_webview_resources,,,$(TARGET_2ND_ARCH))/android_webview_resources.stamp
+    $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp
 
 include $(LOCAL_PATH)/java_library_common.mk
 
diff --git a/android_webview/build/resources_config.mk b/android_webview/build/resources_config.mk
index f32ef6f..5f03256 100644
--- a/android_webview/build/resources_config.mk
+++ b/android_webview/build/resources_config.mk
@@ -13,10 +13,10 @@ android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml
 # We defeat the optimization by including an empty values.xml file in the list.
 android_webview_resources_dirs := \
     $(call my-dir)/res_hack \
-    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_content_resources/jarjar_res \
-    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_ui_resources/jarjar_res \
-    $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(TARGET_2ND_ARCH))/ui_strings_grd/res_grit \
-    $(call intermediates-dir-for,GYP,content_strings_grd,,,$(TARGET_2ND_ARCH))/content_strings_grd/res_grit
+    $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_resources/jarjar_res \
+    $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources/jarjar_res \
+    $(call intermediates-dir-for,GYP,ui_strings_grd)/ui_strings_grd/res_grit \
+    $(call intermediates-dir-for,GYP,content_strings_grd)/content_strings_grd/res_grit
 
 android_webview_aapt_flags := --auto-add-overlay
 android_webview_aapt_flags += --custom-package com.android.webview.chromium
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk
index e06b40e..cd6aad0 100644
--- a/android_webview/java_library_common.mk
+++ b/android_webview/java_library_common.mk
@@ -38,26 +38,24 @@ LOCAL_SRC_FILES += \
 
 # Java files generated from .template rules. This list should match list of java dependencies in
 # android_webview/all_webview.gyp
-# TODO(torne): remove TARGET_2ND_ARCH here once we're no longer 64-bit blacklisted in the Android
-# build system. http://crbug.com/358141
 LOCAL_GENERATED_SOURCES := \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/ApplicationState.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/MemoryPressureLevelList.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/media/ImageFormat.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertificateMimeType.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertVerifyStatusAndroid.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/NetError.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/PrivateKeyType.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/WindowOpenDisposition.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/gfx/BitmapFormat.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ApplicationState.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPressureLevelList.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/GestureEventType.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/PageTransitionTypes.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/SpeechRecognitionError.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/PopupItemType.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ScreenOrientationValues.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyType.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDisposition.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/gfx/BitmapFormat.java \
 
 # content dependencies on java components that are provided by the system on
 # android
diff --git a/android_webview/webview_pak.mk b/android_webview/webview_pak.mk
index f3c40ef..dff89a2 100644
--- a/android_webview/webview_pak.mk
+++ b/android_webview/webview_pak.mk
@@ -11,8 +11,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)/webview/paks
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-# TODO(torne): remove TARGET_2ND_ARCH here once we're no longer 64-bit blacklisted in the Android
-# build system. http://crbug.com/358141
-built_by_gyp := $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/$(LOCAL_BUILT_MODULE_STEM)
+built_by_gyp := $(call intermediates-dir-for,GYP,shared)/$(LOCAL_BUILT_MODULE_STEM)
 
 $(eval $(call copy-one-file,$(built_by_gyp),$(LOCAL_BUILT_MODULE)))