Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: build/android/ant/apk-obfuscate.xml

Issue 12922004: Fix proguard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@antpy
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/apk-obfuscate.xml
diff --git a/build/android/ant/apk-obfuscate.xml b/build/android/ant/apk-obfuscate.xml
index bdc8a793f1c3de4bd27474dc66a8365c94ae2378..75989700db0f81fba35a659e9c5701049ab95ac7 100644
--- a/build/android/ant/apk-obfuscate.xml
+++ b/build/android/ant/apk-obfuscate.xml
@@ -29,6 +29,11 @@
<property name="target" value="android-${ANDROID_SDK_VERSION}"/>
<property name="android.tools.dir" location="${sdk.dir}/tools" />
+ <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
+ <path id="project.target.class.path">
+ <pathelement location="${project.target.android.jar}" />
+ </path>
+
<!-- jar file from where the tasks are loaded -->
<path id="android.antlibs">
@@ -70,7 +75,13 @@
<script language="javascript" src="${create.test.jar.file}"/>
</then>
</if>
- <if condition="${proguard.enabled}">
+ <if>
+ <condition>
+ <and>
+ <istrue value="${proguard.enabled}"/>
+ <equals arg1="${CONFIGURATION_NAME}" arg2="Release"/>
+ </and>
+ </condition>
<then>
<property name="obfuscate.absolute.dir" location="${out.absolute.dir}/proguard"/>
<property name="preobfuscate.jar.file" value="${obfuscate.absolute.dir}/original.jar"/>
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698