diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:04:27 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:04:27 +0000 |
| commit | 3adb9b2d5719b3afbbd2b7b92fa534c7ceb304e1 (patch) | |
| tree | 23d859495e7b939cf0371b7cd0e853df2efc2822 /build/java_apk.gypi | |
| parent | b8f4d616d116ae680bc5bc7ebf0db6513cdb826b (diff) | |
| download | chromium_src-3adb9b2d5719b3afbbd2b7b92fa534c7ceb304e1.zip chromium_src-3adb9b2d5719b3afbbd2b7b92fa534c7ceb304e1.tar.gz chromium_src-3adb9b2d5719b3afbbd2b7b92fa534c7ceb304e1.tar.bz2 | |
Fix proguard
Proguard should only be run in Release mode (in gyp, proguard_enabled is
not set based on the configuration). This is the way that we had
been determining whether or not to run proguard before recent Ant
refactoring.
Also, proguard needs the path to the android.jar
BUG=224079
Review URL: https://chromiumcodereview.appspot.com/12922004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index b9f1bad..ddac0e4 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -280,6 +280,7 @@ '-DANDROID_SDK_VERSION=<(android_sdk_version)', '-DAPK_NAME=<(apk_name)', '-DCREATE_TEST_JAR_PATH=<(DEPTH)/build/android/ant/create-test-jar.js', + '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', '-DGENERATED_SRC_DIRS=>(generated_src_dirs)', '-DINPUT_JARS_PATHS=>(input_jars_paths)', '-DIS_TEST_APK=<(is_test_apk)', |