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

Side by Side Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 2329573002: Refactor base's proguard flags to be more usable by cronet (Closed)
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « base/android/release_proguard_config.flags ('k') | chrome/android/webapk/shell_apk/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//chrome/common/features.gni") 7 import("//chrome/common/features.gni")
8 import("//third_party/leakcanary/config.gni") 8 import("//third_party/leakcanary/config.gni")
9 import("channel.gni") 9 import("channel.gni")
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 if (is_java_debug) { 43 if (is_java_debug) {
44 enable_multidex = true 44 enable_multidex = true
45 } else { 45 } else {
46 proguard_enabled = true 46 proguard_enabled = true
47 if (!defined(proguard_configs)) { 47 if (!defined(proguard_configs)) {
48 proguard_configs = [] 48 proguard_configs = []
49 } 49 }
50 proguard_configs += [ 50 proguard_configs += [
51 "//chrome/android/java/proguard.flags", 51 "//chrome/android/java/proguard.flags",
52 "//base/android/base_proguard_config.flags", 52 "//base/android/proguard/chromium_apk.flags",
53 "//base/android/release_proguard_config.flags", 53 "//base/android/proguard/chromium_code.flags",
54 ] 54 ]
55 } 55 }
56 56
57 if (!defined(use_chromium_linker)) { 57 if (!defined(use_chromium_linker)) {
58 use_chromium_linker = chrome_public_apk_use_chromium_linker 58 use_chromium_linker = chrome_public_apk_use_chromium_linker
59 } 59 }
60 60
61 if (use_chromium_linker) { 61 if (use_chromium_linker) {
62 if (!defined(load_library_from_apk)) { 62 if (!defined(load_library_from_apk)) {
63 load_library_from_apk = chrome_public_apk_load_library_from_apk 63 load_library_from_apk = chrome_public_apk_load_library_from_apk
64 } 64 }
65 65
66 if (!defined(enable_relocation_packing)) { 66 if (!defined(enable_relocation_packing)) {
67 enable_relocation_packing = chrome_public_apk_use_relocation_packer 67 enable_relocation_packing = chrome_public_apk_use_relocation_packer
68 } 68 }
69 } 69 }
70 } 70 }
71 } 71 }
OLDNEW
« no previous file with comments | « base/android/release_proguard_config.flags ('k') | chrome/android/webapk/shell_apk/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698