diff options
| author | lfg <lfg@chromium.org> | 2015-06-17 14:39:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-17 21:39:43 +0000 |
| commit | 25d3a9a01ac398d4d0fc0f22d3b3ebe24a2f4818 (patch) | |
| tree | 197b4e296d1cbd623da74a8c58ad01395ce29019 | |
| parent | 6daedb499182a5b6b0bcd54004afb7ebb3c3443b (diff) | |
| download | chromium_src-25d3a9a01ac398d4d0fc0f22d3b3ebe24a2f4818.zip chromium_src-25d3a9a01ac398d4d0fc0f22d3b3ebe24a2f4818.tar.gz chromium_src-25d3a9a01ac398d4d0fc0f22d3b3ebe24a2f4818.tar.bz2 | |
Revert of Move the asset dir below <(PRODUCT_DIR). (patchset #1 id:1 of https://codereview.chromium.org/1184323002/)
Reason for revert:
Breaks android. To reproduce you must do a clean build (i.e. rm -rf out && gyp && ninja).
Original issue's description:
> Move the asset dir below <(PRODUCT_DIR).
>
> 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.
>
> @reviewers: I don't really understand the Android build + packaging,
> so I'm not at all sure if this has any unwanted side effects. Feel free
> to reject the CL if it may cause issues elsewhere.
>
> BUG=500113
>
> Committed: https://crrev.com/673904b45492152cc13de1a5baa604fc74c80d0a
> Cr-Commit-Position: refs/heads/master@{#334788}
TBR=rmcilroy@chromium.org,dtrainor@chromium.org,vogelheim@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=500113
Review URL: https://codereview.chromium.org/1178273009
Cr-Commit-Position: refs/heads/master@{#334929}
| -rw-r--r-- | chrome/chrome_android_paks.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 2e17662..13f5845 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', |