summaryrefslogtreecommitdiffstats
path: root/build/java_prebuilt.gypi
diff options
context:
space:
mode:
authorhanxi <hanxi@chromium.org>2015-08-27 15:23:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-27 22:23:44 +0000
commitfac74610cdba9a4d9190c21a5880b751d3324634 (patch)
tree91da17188a10df5186d79f2798efe9fa3cb395bb /build/java_prebuilt.gypi
parent13d636780595c920e4c53c0b8335ca9c85409079 (diff)
downloadchromium_src-fac74610cdba9a4d9190c21a5880b751d3324634.zip
chromium_src-fac74610cdba9a4d9190c21a5880b751d3324634.tar.gz
chromium_src-fac74610cdba9a4d9190c21a5880b751d3324634.tar.bz2
Update usage of Proguard in clank after moving Proguard to third_party.
This is a follow up CL of https://codereview.chromium.org/1288393002/. BUG=505932 Review URL: https://codereview.chromium.org/1292313004 Cr-Commit-Position: refs/heads/master@{#346006}
Diffstat (limited to 'build/java_prebuilt.gypi')
-rw-r--r--build/java_prebuilt.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/java_prebuilt.gypi b/build/java_prebuilt.gypi
index 8efc4ef..a3271bf 100644
--- a/build/java_prebuilt.gypi
+++ b/build/java_prebuilt.gypi
@@ -63,7 +63,7 @@
'action_name': 'proguard_<(_target_name)',
'message': 'Proguard preprocessing <(_target_name) jar',
'inputs': [
- '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
+ '<(DEPTH)/third_party/proguard/lib/proguard.jar',
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/proguard.py',
'<(jar_path)',
@@ -74,7 +74,7 @@
],
'action': [
'python', '<(DEPTH)/build/android/gyp/proguard.py',
- '--proguard-path=<(android_sdk_root)/tools/proguard/lib/proguard.jar',
+ '--proguard-path=<(DEPTH)/third_party/proguard/lib/proguard.jar',
'--input-path=<(jar_path)',
'--output-path=<(dex_input_jar_path)',
'--proguard-config=<(proguard_config)',