From 1a951a8331d2e4deaa3bc4be283ec1a155b89abe Mon Sep 17 00:00:00 2001 From: vogelheim Date: Tue, 23 Jun 2015 03:24:18 -0700 Subject: Move the asset dir below <(PRODUCT_DIR), try 2. Because: crrev.com/594603003 moved the V8 snapshot into an external file in the asset dir. This makes the asset dir content dependent on the platform and build mode (debug vs release). Hence, the dir can no longer be shared between debug + release builds. crbug.com/500113 contains more information. The previous attempt (crrev.com/1184323002) was a bit *too* simple and got reverted for "breaking Android". Which, indeed, it did, since it ended up no longer putting the snapshot into the .apk, which, well, breaks Android. This time I: - made sure no references to <(PRODUCT_DIR)/../assets remain in the .gyp files. - Manually tested on an Android device. @reviewers: I'm a bit surprised the trybots wouldn't catch something like this. Is there a particular set of bots I should trigger? R=rmcilroy@chromium.org,dtrainor@chromium.org BUG=500113 Review URL: https://codereview.chromium.org/1185163004 Cr-Commit-Position: refs/heads/master@{#335656} --- chrome/android/chrome_apk.gypi | 2 +- chrome/chrome_android_paks.gypi | 2 +- chrome/chrome_shell.gypi | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/android/chrome_apk.gypi b/chrome/android/chrome_apk.gypi index ffc0a6b..59cca2d 100644 --- a/chrome/android/chrome_apk.gypi +++ b/chrome/android/chrome_apk.gypi @@ -18,7 +18,7 @@ }], ], }, - 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', + 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)', 'java_in_dir_suffix': '/src_dummy', 'native_lib_version_name': '<(version_full)', 'proguard_enabled': 'true', diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 1be60d8..d3a105c 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'variables': { - 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', + 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/assets/<(package_name)', 'chrome_android_pak_input_resources': [ '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi index 0fdf239..edddbd4 100644 --- a/chrome/chrome_shell.gypi +++ b/chrome/chrome_shell.gypi @@ -97,7 +97,7 @@ 'native_lib_version_name': '<(version_full)', 'java_in_dir': 'android/shell/java', 'resource_dir': 'android/shell/res', - 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', + 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)', 'native_lib_target': 'libchromeshell', 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', @@ -150,7 +150,7 @@ 'native_lib_version_name': '<(version_full)', 'java_in_dir': 'android/shell/java', 'resource_dir': 'android/shell/res', - 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', + 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)', 'native_lib_target': 'libchromesyncshell', 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', -- cgit v1.1