diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:07:59 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:07:59 +0000 |
| commit | 24328455662998597e3af68672736e8ec1997ac4 (patch) | |
| tree | 8faefa1a81dec0283f7d3be01a5f83a5b7b568c5 /android_webview/webview_pak.mk | |
| parent | 577d2e4ffc550a981a925ad0a8debf7252b1d681 (diff) | |
| download | chromium_src-24328455662998597e3af68672736e8ec1997ac4.zip chromium_src-24328455662998597e3af68672736e8ec1997ac4.tar.gz chromium_src-24328455662998597e3af68672736e8ec1997ac4.tar.bz2 | |
android_webview: fix to avoid 64-bit blacklisting.
Currently the chromium code is blacklisted for 64-bit builds in Android
which makes testing our 64-bit build support difficult. In order to
remove this blacklist entry we need to make sure that non-native-code
build targets refer to the 32-bit output directories, since the 64-bit
ones won't exist in all configurations yet.
We can revert this change once we have full 64-bit build support.
BUG=358141
NOTRY=true
Review URL: https://codereview.chromium.org/238883003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/webview_pak.mk')
| -rw-r--r-- | android_webview/webview_pak.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android_webview/webview_pak.mk b/android_webview/webview_pak.mk index dff89a2..f3c40ef 100644 --- a/android_webview/webview_pak.mk +++ b/android_webview/webview_pak.mk @@ -11,6 +11,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)/webview/paks include $(BUILD_SYSTEM)/base_rules.mk -built_by_gyp := $(call intermediates-dir-for,GYP,shared)/$(LOCAL_BUILT_MODULE_STEM) +# 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) $(eval $(call copy-one-file,$(built_by_gyp),$(LOCAL_BUILT_MODULE))) |