[Cronet] add base proguard flags

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 3f3ed4bc60ded282e7664689ec509f2f87ac808a..66e7314ebae39d8225b602a0b9e4b5ea42788b09 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -391,6 +391,8 @@ android_apk("cronet_sample_apk") {
     proguard_configs = [
       "proguard.cfg",
       "sample/javatests/proguard.cfg",
+      "//base/android/base_proguard_config.flags",
+      "//testing/android/proguard_for_test.flags",

[smaier, 2016/08/11 16:08:28]

Perhaps I don't quite understand what the sample_apk's purpose is, but why are
you including the testing ProGuard flags here? These flags are meant to be
applied to instrumentation tests.

[xunjieli, 2016/08/11 21:05:52]

Done. You are right. This shouldn't be here. The "sample/javatests/proguard.cfg"
tripped me up. I will move that to the instrumentation test target in a
follow-up. 

     ]
   }
 }
@@ -401,7 +403,7 @@ android_apk("cronet_sample_apk") {
 # "tested apk" are removed from the "instrumentation test apk".
 android_resources("cronet_sample_test_apk_resources") {
   resource_dirs = [ "sample/res" ]
-  android_manifest = "sample/AndroidManifest.xml"
+  android_manifest = "sample/javatests/AndroidManifest.xml"
 }
 
 instrumentation_test_apk("cronet_sample_test_apk") {
@@ -712,6 +714,7 @@ android_apk("cronet_perf_test_apk") {
   proguard_configs = [
     "proguard.cfg",
     "test/javaperftests/proguard.cfg",
+    "//base/android/base_proguard_config.flags",
   ]
 }
 
@@ -879,7 +882,6 @@ copy("cronet_package_copy") {
     "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
     "//AUTHORS",
     "//chrome/VERSION",
-    "//components/cronet/android/proguard.cfg",
   ]
   outputs = [
     "$_package_dir/{{source_file_part}}",
@@ -890,6 +892,20 @@ copy("cronet_package_copy") {
   ]
 }
 
+action("cronet_combine_proguard_flags") {
+  script = "//components/cronet/tools/generate_proguard_file.py"
+  outputs = [
+    "$_package_dir/proguard.cfg",
+  ]
+
+  args = [
+    "--output-file",
+    rebase_path("$_package_dir/proguard.cfg", root_build_dir),
+    rebase_path("//base/android/base_proguard_config.flags", root_build_dir),
+    rebase_path("//components/cronet/android/proguard.cfg", root_build_dir),
+  ]
+}
+
 copy("cronet_package_copy_native_lib") {
   sources = [
     "$root_out_dir/libcronet.so",
@@ -916,6 +932,7 @@ copy("cronet_package_copy_native_lib_unstripped") {
 
 group("cronet_package") {
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_package_copy",
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",