diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 20:28:16 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 20:28:16 +0000 |
| commit | 0e69c2d813691dfe5d2df3b14e84a198377d2c73 (patch) | |
| tree | aae3baa52f55bcb7a33191fc798e63d0dbc1ab8f /build/android/dex_action.gypi | |
| parent | 64bd0217b9360b1981491eeeeb3ebab288a69ee2 (diff) | |
| download | chromium_src-0e69c2d813691dfe5d2df3b14e84a198377d2c73.zip chromium_src-0e69c2d813691dfe5d2df3b14e84a198377d2c73.tar.gz chromium_src-0e69c2d813691dfe5d2df3b14e84a198377d2c73.tar.bz2 | |
Make test apks only dex files not in tested apk
At runtime, the classloader will look for classes in both apk's dex
files. In the standard Android build system, an instrumentation test
apk's dex file does not include the classes included in the tested apk's
dex file.
To do this, when dexing, write a file listing the inputs to the dex
file. When dexing for an instrumentation apk, exclude those files listed
as inputs of the tested apk's dex file.
For proguarded apks, this exclusion will need to happen for proguard
inputs instead of dex inputs, so this change does not cover that case.
BUG=272790
NOTRY=true
Review URL: https://codereview.chromium.org/313273004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/dex_action.gypi')
| -rw-r--r-- | build/android/dex_action.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/android/dex_action.gypi b/build/android/dex_action.gypi index 7e24d1e..0575e52 100644 --- a/build/android/dex_action.gypi +++ b/build/android/dex_action.gypi @@ -32,6 +32,7 @@ 'proguard_enabled%': 'false', 'proguard_enabled_input_path%': '', 'dex_no_locals%': 0, + 'dex_additional_options': [], }, 'inputs': [ '<(DEPTH)/build/android/gyp/util/build_utils.py', @@ -41,6 +42,7 @@ ], 'outputs': [ '<(output_path)', + '<(output_path).inputs', ], 'action': [ 'python', '<(DEPTH)/build/android/gyp/dex.py', @@ -49,7 +51,8 @@ '--configuration-name=<(CONFIGURATION_NAME)', '--proguard-enabled=<(proguard_enabled)', '--proguard-enabled-input-path=<(proguard_enabled_input_path)', - '--no-locals=<(dex_no_locals)', + '--no-locals=>(dex_no_locals)', + '>@(dex_additional_options)', '>@(dex_input_paths)', '>@(dex_generated_input_dirs)', ] |