diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 16:01:47 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 16:01:47 +0000 |
| commit | 76ee85c30ed0c9d9cd4fd78b2f9600370f4dc513 (patch) | |
| tree | 522a5d2f21d654bbff8c419539c4fddd5568c074 /chrome/chrome_android_paks.gypi | |
| parent | 5118fbcaf20898a4bbfe3eb964a62e07517ba0d1 (diff) | |
| download | chromium_src-76ee85c30ed0c9d9cd4fd78b2f9600370f4dc513.zip chromium_src-76ee85c30ed0c9d9cd4fd78b2f9600370f4dc513.tar.gz chromium_src-76ee85c30ed0c9d9cd4fd78b2f9600370f4dc513.tar.bz2 | |
[Android] Split out/asset subdirectories for Chromium TestShell and Chrome.
Chromium TestShell includes DevTools frontend resources, which
we don't want to have in Chrome for Android.
BUG=163955
R=torne@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11415286
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android_paks.gypi')
| -rw-r--r-- | chrome/chrome_android_paks.gypi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index ccc4f40..967cb70 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -3,7 +3,15 @@ # found in the LICENSE file. { 'variables': { - 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/chrome', + # This variable is left out to avoid breaking downstream Chrome for Android + # build. It will be removed once the corresponding downstream change will + # land. + # crbug.com/163955 + 'variables': { + 'package_name%': 'chrome', + }, + + 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/resources.pak', |