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

Unified Diff: components/cronet.gypi

Issue 512953002: Use proguard.cfg in cronet sample apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index a68819dbe0cd9a739f31d24dd1dea95a0d1749aa..f9ef3dc76466810de8e60f441c58c6c07cf0d451 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -331,12 +331,19 @@
'type': 'none',
'dependencies': [
'cronet',
+ 'cronet_stub',
],
'variables': {
'apk_name': 'CronetSample',
'java_in_dir': 'cronet/android/sample',
'resource_dir': 'cronet/android/sample/res',
'native_lib_target': 'libcronet',
+ 'proguard_enabled': 'true',
+ 'proguard_flags_paths': [
+ 'cronet/android/proguard.cfg',
+ # Proguard config for instrumentation test apk.
+ 'cronet/android/sample/javatests/proguard.cfg',
+ ],
},
'includes': [ '../build/java_apk.gypi' ],
},
@@ -357,7 +364,9 @@
'target_name': 'cronet_sample_test_apk',
'type': 'none',
'dependencies': [
+ 'cronet',
'cronet_sample_apk_java',
+ 'cronet_stub',
'../base/base.gyp:base_java',
'../base/base.gyp:base_javatests',
'../base/base.gyp:base_java_test_support',
@@ -368,6 +377,7 @@
'variables': {
'apk_name': 'CronetSampleTest',
'java_in_dir': 'cronet/android/sample/javatests',
+ 'proguard_enabled': 'true',
'resource_dir': 'cronet/android/sample/res',
'is_test_apk': 1,
},

Powered by Google App Engine
This is Rietveld 408576698