diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 03:44:46 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 03:44:46 +0000 |
| commit | e7aced51d06699bab7a6258d575a3259cdefde57 (patch) | |
| tree | bd68aaa788ca737ed3b38236962908f9c9dda481 /build/android/ant | |
| parent | 2475ac6cf4f8e49617d9e84167e89a252827724f (diff) | |
| download | chromium_src-e7aced51d06699bab7a6258d575a3259cdefde57.zip chromium_src-e7aced51d06699bab7a6258d575a3259cdefde57.tar.gz chromium_src-e7aced51d06699bab7a6258d575a3259cdefde57.tar.bz2 | |
Fix proguard logic, set proguard config only when proguard is enabled.
Even when proguard config is set to an empty string, proguard can still
run, we do not want proguard to run if it is not explicitly enabled for
a target.
BUG=149214
Review URL: https://chromiumcodereview.appspot.com/11078015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/ant')
| -rw-r--r-- | build/android/ant/chromium-apk.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml index d295dc9..45c0d3d 100644 --- a/build/android/ant/chromium-apk.xml +++ b/build/android/ant/chromium-apk.xml @@ -40,8 +40,14 @@ <property-value name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/> <property-value name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/> - <property name="proguard.config" value="${PROGUARD_FLAGS}"/> - <property name="proguard.enabled" value="${PROGUARD_ENABLED}"/> + <!-- + We use the PROGUARD_ENABLED flag for enabling proguard. By default proguard is enabled for + Release builds if proguard.config is set. Setting proguard.config even to an empty string will + enable proguard. Set this property only when we have explicitly enabled proguard. + --> + <condition property="proguard.config" value="${PROGUARD_FLAGS}"> + <istrue value="${PROGUARD_ENABLED}"/> + </condition> <!-- TODO(shashishekhar): Enable emma and code-coverage filters. --> <condition property="asset.absolute.dir" |