Index: components/cronet/android/BUILD.gn |
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn |
index 29dcc7c5e267b395e428a89ae27c13e5cc38e7a5..43edaac03bbbb391db988413fa912a7a0c26f3c7 100644 |
--- a/components/cronet/android/BUILD.gn |
+++ b/components/cronet/android/BUILD.gn |
@@ -402,6 +402,7 @@ android_apk("cronet_sample_apk") { |
proguard_configs = [ |
"proguard.cfg", |
"sample/javatests/proguard.cfg", |
+ "//base/android/base_proguard_config.flags", |
] |
} |
} |
@@ -717,6 +718,7 @@ android_apk("cronet_perf_test_apk") { |
proguard_configs = [ |
"proguard.cfg", |
"test/javaperftests/proguard.cfg", |
+ "//base/android/base_proguard_config.flags", |
] |
} |
@@ -901,7 +903,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}}", |
@@ -912,6 +913,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", |
@@ -963,6 +978,7 @@ group("cronet_package") { |
# not including any deps in cronet_package target otherwise. |
if (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon) { |
deps = [ |
+ ":cronet_combine_proguard_flags", |
":cronet_package_copy", |
":cronet_package_copy_native_lib", |
":cronet_package_copy_native_lib_unstripped", |