| 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/compiler/compiler.gni") |
| 7 import("//chrome/common/features.gni") | 8 import("//chrome/common/features.gni") |
| 8 import("//third_party/leakcanary/config.gni") | 9 import("//third_party/leakcanary/config.gni") |
| 9 import("channel.gni") | 10 import("channel.gni") |
| 10 | 11 |
| 11 declare_args() { | 12 declare_args() { |
| 12 # Whether chrome_public_apk should use the crazy linker. | 13 # Whether chrome_public_apk should use the crazy linker. |
| 13 chrome_public_apk_use_chromium_linker = chromium_linker_supported | 14 chrome_public_apk_use_chromium_linker = chromium_linker_supported |
| 14 | 15 |
| 15 # Whether chrome_public_apk should use the relocation packer. | 16 # Whether chrome_public_apk should use the relocation packer. |
| 16 chrome_public_apk_use_relocation_packer = chromium_linker_supported | 17 chrome_public_apk_use_relocation_packer = chromium_linker_supported |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 enable_relocation_packing = chrome_public_apk_use_relocation_packer | 75 enable_relocation_packing = chrome_public_apk_use_relocation_packer |
| 75 } | 76 } |
| 76 } | 77 } |
| 77 } | 78 } |
| 78 } | 79 } |
| 79 | 80 |
| 80 template("monochrome_public_apk_tmpl") { | 81 template("monochrome_public_apk_tmpl") { |
| 81 chrome_public_apk_tmpl(target_name) { | 82 chrome_public_apk_tmpl(target_name) { |
| 82 # Always build 64-bit //android_webview:monochrome because Chrome runs | 83 # Always build 64-bit //android_webview:monochrome because Chrome runs |
| 83 # in 32-bit mode. | 84 # in 32-bit mode. |
| 84 if (android_64bit_target_cpu) { | 85 if (is_target_cpu_64bit) { |
| 85 shared_libraries = [ "//android_webview:monochrome" ] | 86 shared_libraries = [ "//android_webview:monochrome" ] |
| 86 } else { | 87 } else { |
| 87 shared_libraries = [ "//chrome/android:monochrome" ] | 88 shared_libraries = [ "//chrome/android:monochrome" ] |
| 88 } | 89 } |
| 89 if (android_64bit_target_cpu && build_apk_secondary_abi) { | 90 if (is_target_cpu_64bit && build_apk_secondary_abi) { |
| 90 secondary_abi_shared_libraries = | 91 secondary_abi_shared_libraries = |
| 91 [ "//chrome/android:monochrome_secondary_abi_lib" ] | 92 [ "//chrome/android:monochrome_secondary_abi_lib" ] |
| 92 } | 93 } |
| 93 | 94 |
| 94 alternative_android_sdk_jar = webview_framework_jar | 95 alternative_android_sdk_jar = webview_framework_jar |
| 95 app_as_shared_lib = true | 96 app_as_shared_lib = true |
| 96 use_chromium_linker = false | 97 use_chromium_linker = false |
| 97 requires_sdk_api_level_23 = true | 98 requires_sdk_api_level_23 = true |
| 98 enable_relocation_packing = true | 99 enable_relocation_packing = true |
| 99 extensions_to_not_compress = ".lpak,.pak,.bin,.dat" | 100 extensions_to_not_compress = ".lpak,.pak,.bin,.dat" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 115 ] | 116 ] |
| 116 | 117 |
| 117 if (!is_java_debug) { | 118 if (!is_java_debug) { |
| 118 if (!defined(proguard_configs)) { | 119 if (!defined(proguard_configs)) { |
| 119 proguard_configs = [] | 120 proguard_configs = [] |
| 120 } | 121 } |
| 121 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] | 122 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] |
| 122 } | 123 } |
| 123 } | 124 } |
| 124 } | 125 } |
| OLD | NEW |