| OLD | NEW | 
|    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("//build/config/locales.gni") |    7 import("//build/config/locales.gni") | 
|    8 import("//chrome/common/features.gni") |    8 import("//chrome/common/features.gni") | 
|    9 import("//third_party/leakcanary/config.gni") |    9 import("//third_party/leakcanary/config.gni") | 
|   10 import("channel.gni") |   10 import("channel.gni") | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
|   24       chromium_linker_supported && |   24       chromium_linker_supported && | 
|   25       (current_cpu == "arm64" || current_cpu == "x64") |   25       (current_cpu == "arm64" || current_cpu == "x64") | 
|   26  |   26  | 
|   27   # Enables ProGuard obfuscation of Chromium packages. |   27   # Enables ProGuard obfuscation of Chromium packages. | 
|   28   enable_proguard_obfuscation = false |   28   enable_proguard_obfuscation = false | 
|   29 } |   29 } | 
|   30  |   30  | 
|   31 default_chrome_public_jinja_variables = [ |   31 default_chrome_public_jinja_variables = [ | 
|   32   "channel=$android_channel", |   32   "channel=$android_channel", | 
|   33   "enable_leakcanary=$enable_leakcanary", |   33   "enable_leakcanary=$enable_leakcanary", | 
|   34   "enable_vr_shell=$enable_vr_shell", |  | 
|   35   "enable_webvr=$enable_webvr", |   34   "enable_webvr=$enable_webvr", | 
|   36 ] |   35 ] | 
|   37  |   36  | 
|   38 template("chrome_public_apk_tmpl") { |   37 template("chrome_public_apk_tmpl") { | 
|   39   android_apk(target_name) { |   38   android_apk(target_name) { | 
|   40     forward_variables_from(invoker, "*") |   39     forward_variables_from(invoker, "*") | 
|   41     _native_lib_file = |   40     _native_lib_file = | 
|   42         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) |   41         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) | 
|   43     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" |   42     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" | 
|   44     native_lib_version_rule = "//build/util:chrome_version_json" |   43     native_lib_version_rule = "//build/util:chrome_version_json" | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  125     ] |  124     ] | 
|  126  |  125  | 
|  127     if (!is_java_debug) { |  126     if (!is_java_debug) { | 
|  128       if (!defined(proguard_configs)) { |  127       if (!defined(proguard_configs)) { | 
|  129         proguard_configs = [] |  128         proguard_configs = [] | 
|  130       } |  129       } | 
|  131       proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] |  130       proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] | 
|  132     } |  131     } | 
|  133   } |  132   } | 
|  134 } |  133 } | 
| OLD | NEW |