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' ], |
}, |
], |