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

Unified Diff: components/cronet/android/BUILD.gn

Issue 2214013002: [Cronet] add base proguard flags (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Synced to 0855f910f2561da7beb87578f4af99faa6db75ec Created 4 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 | components/cronet/android/proguard.cfg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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",
« no previous file with comments | « no previous file | components/cronet/android/proguard.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698