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

Unified Diff: build/android/tests/multiple_proguards/multiple_proguards.gyp

Issue 571203003: Remove guava dependency for multiple_proguards test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-more-guava-dependencies
Patch Set: Created 6 years, 3 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/tests/multiple_proguards/proguard1.flags » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/tests/multiple_proguards/multiple_proguards.gyp
diff --git a/build/android/tests/multiple_proguards/multiple_proguards.gyp b/build/android/tests/multiple_proguards/multiple_proguards.gyp
index 158d4ce0259876dc744a0b024f0d4d1a092d38a3..48a5d7ba8bd422976ef7c5401c78445cdd677e2e 100644
--- a/build/android/tests/multiple_proguards/multiple_proguards.gyp
+++ b/build/android/tests/multiple_proguards/multiple_proguards.gyp
@@ -14,6 +14,9 @@
'java_in_dir': '.',
'proguard_enabled': 'true',
'proguard_flags_paths': [
+ # Both these proguard?.flags files need to be part of the build to
+ # remove both warnings from the src/dummy/DummyActivity.java file, else the
+ # build will fail.
'proguard1.flags',
'proguard2.flags',
],
@@ -22,12 +25,9 @@
'apk_name': 'MultipleProguards',
# This is a build-only test. There's nothing to install.
'gyp_managed_install': 0,
+ # The Java code produces warnings, so force the build to not show them.
+ 'chromium_code': 0,
},
- 'dependencies': [
- # guava has references to objects using reflection which
- # should be ignored in proguard step.
- '../../../../third_party/guava/guava.gyp:guava_javalib',
- ],
'includes': [ '../../../../build/java_apk.gypi' ],
},
],
« no previous file with comments | « no previous file | build/android/tests/multiple_proguards/proguard1.flags » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698