diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 22:40:39 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 22:40:39 +0000 |
| commit | efcc84fca4ac288401d21f556892b3e949f945d6 (patch) | |
| tree | da491776d97c4eb220e47e7b62aebfab47078015 /chrome/chrome_android.gypi | |
| parent | 575423574802c25c0600fe02aacdf8b386247d89 (diff) | |
| download | chromium_src-efcc84fca4ac288401d21f556892b3e949f945d6.zip chromium_src-efcc84fca4ac288401d21f556892b3e949f945d6.tar.gz chromium_src-efcc84fca4ac288401d21f556892b3e949f945d6.tar.bz2 | |
Fix chromium testshell crash on startup.
After http://codereview.chromium.org/10876056/, we need to include chrome's pak files in testshell.
Review URL: https://codereview.chromium.org/11092032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 26dbdf8..c5969d1 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -53,6 +53,7 @@ 'apk_name': 'ChromiumTestShell', 'java_in_dir': 'android/testshell/java', 'resource_dir': '../res', + 'asset_location': '<(ant_build_out)/../assets/chrome', 'native_libs_paths': [ '<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so', ], 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ], }, |