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

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

Issue 2261163003: Move gvr library proguard config to chrome_public_apk_tmpl.gni so that Chrome apk can also use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « chrome/android/BUILD.gn ('k') | no next file » | 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 _prev_proguard_configs = [] 47 _prev_proguard_configs = []
48 if (defined(proguard_configs)) { 48 if (defined(proguard_configs)) {
49 _prev_proguard_configs = proguard_configs 49 _prev_proguard_configs = proguard_configs
50 } 50 }
51 proguard_configs = [] 51 proguard_configs = []
52 proguard_configs = _prev_proguard_configs + [ 52 proguard_configs = _prev_proguard_configs + [
53 "//chrome/android/java/proguard.flags", 53 "//chrome/android/java/proguard.flags",
54 "//base/android/base_proguard_config.flags", 54 "//base/android/base_proguard_config.flags",
55 "//base/android/release_proguard_config.flags", 55 "//base/android/release_proguard_config.flags",
56 ] 56 ]
57 if (enable_webvr) {
58 proguard_configs +=
59 [ "//third_party/gvr-android-sdk/proguard/base.flags" ]
60 }
57 } 61 }
58 62
59 if (!defined(use_chromium_linker)) { 63 if (!defined(use_chromium_linker)) {
60 use_chromium_linker = chrome_public_apk_use_chromium_linker 64 use_chromium_linker = chrome_public_apk_use_chromium_linker
61 } 65 }
62 66
63 if (use_chromium_linker) { 67 if (use_chromium_linker) {
64 if (!defined(load_library_from_apk)) { 68 if (!defined(load_library_from_apk)) {
65 load_library_from_apk = chrome_public_apk_load_library_from_apk 69 load_library_from_apk = chrome_public_apk_load_library_from_apk
66 } 70 }
67 71
68 if (!defined(enable_relocation_packing)) { 72 if (!defined(enable_relocation_packing)) {
69 enable_relocation_packing = chrome_public_apk_use_relocation_packer 73 enable_relocation_packing = chrome_public_apk_use_relocation_packer
70 } 74 }
71 } 75 }
72 } 76 }
73 } 77 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698