diff options
| author | jayjang@chromium.org <jayjang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:12:42 +0000 |
|---|---|---|
| committer | jayjang@chromium.org <jayjang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:12:42 +0000 |
| commit | fccf7fd4c76aaba79d34f6a34e39edb432df1b78 (patch) | |
| tree | 0e011b389847bd5941108cf0c142523ca6a3bb44 /build/java_apk.gypi | |
| parent | 881fd61ff8078b190cb1b8f019f2acb2004c2133 (diff) | |
| download | chromium_src-fccf7fd4c76aaba79d34f6a34e39edb432df1b78.zip chromium_src-fccf7fd4c76aaba79d34f6a34e39edb432df1b78.tar.gz chromium_src-fccf7fd4c76aaba79d34f6a34e39edb432df1b78.tar.bz2 | |
Fix proguard enabled condition in dexing step. By definition proguard_enabled flag should use "true" and "false" value instead of 1. Also dexing step should take into account "obfuscating" step which is turned on Release mode only.
BUG=
Review URL: https://chromiumcodereview.appspot.com/13145006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index bfe8d9c..f3ac975 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -308,7 +308,7 @@ 'message': 'Dexing <(_target_name) jar', 'variables': { 'conditions': [ - ['proguard_enabled==1', { + ['proguard_enabled=="true" and CONFIGURATION_NAME=="Release"', { 'dex_inputs': [ '<(obfuscated_jar_path)' ], 'dex_generated_inputs': [], }, { |