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

Unified Diff: build/android/pylib/constants/__init__.py

Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update proguard.flags. Created 5 years, 4 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/android/pylib/instrumentation/test_jar.py » ('j') | chrome/android/java/proguard.flags » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/constants/__init__.py
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index 14bf8c3db887e898c6ef22fe92c0e6e5a8f13a8f..92a8172a7efbea6558cdec099630e5d217473d74 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -192,6 +192,8 @@ EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
os.path.join(DIR_SOURCE_ROOT,
'android_emulator_sdk'))
+PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party/proguard')
Yaron 2015/08/25 16:57:35 You're going to have to rebase on https://coderevi
Xi Han 2015/08/25 19:14:56 I keep tracking this CL but it has been reverted,
+
BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
os.environ.get('CHROMIUM_OUT_DIR', 'out'),
'bad_devices.json')
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | chrome/android/java/proguard.flags » ('J')

Powered by Google App Engine
This is Rietveld 408576698