Fix proguard logic, set proguard config only when proguard is enabled.

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161493

[cjhopman, 2012-10-12 00:39:56]

lgtm

https://chromiumcodereview.appspot.com/11078015/diff/1/build/android/ant/chro...
File build/android/ant/chromium-apk.xml (right):

https://chromiumcodereview.appspot.com/11078015/diff/1/build/android/ant/chro...
build/android/ant/chromium-apk.xml:50: <and>
I don't think the <and> block is needed.

[shashi, 2012-10-12 00:48:43]

https://chromiumcodereview.appspot.com/11078015/diff/1/build/android/ant/chro...
File build/android/ant/chromium-apk.xml (right):

https://chromiumcodereview.appspot.com/11078015/diff/1/build/android/ant/chro...
build/android/ant/chromium-apk.xml:50: <and>
Nice catch, thanks. I had one more condition here, which was redundant, I
removed it but left this here.
On 2012/10/12 00:39:56, cjhopman wrote:
> I don't think the <and> block is needed.

[Yaron, 2012-10-12 00:49:11]

lgtm

https://chromiumcodereview.appspot.com/11078015/diff/6002/build/android/ant/c...
File build/android/ant/chromium-apk.xml (right):

https://chromiumcodereview.appspot.com/11078015/diff/6002/build/android/ant/c...
build/android/ant/chromium-apk.xml:49: value="${PROGUARD_FLAGS}">
I think this fits on the line above.

[commit-bot: I haz the power, 2012-10-12 00:54:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11078015/5002

[commit-bot: I haz the power, 2012-10-12 03:44:49]

Change committed as 161493