| 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("//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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 proguard_enabled = true | 45 proguard_enabled = true |
| 46 _prev_proguard_configs = [] | 46 _prev_proguard_configs = [] |
| 47 if (defined(proguard_configs)) { | 47 if (defined(proguard_configs)) { |
| 48 _prev_proguard_configs = proguard_configs | 48 _prev_proguard_configs = proguard_configs |
| 49 } | 49 } |
| 50 proguard_configs = [] | 50 proguard_configs = [] |
| 51 proguard_configs = _prev_proguard_configs + [ | 51 proguard_configs = _prev_proguard_configs + [ |
| 52 "//chrome/android/java/proguard.flags", | 52 "//chrome/android/java/proguard.flags", |
| 53 "//base/android/base_proguard_config.flags", | 53 "//base/android/base_proguard_config.flags", |
| 54 ] | 54 ] |
| 55 if (!enable_all_proguard_optimizations) { | 55 if (enable_all_proguard_optimizations) { |
| 56 proguard_configs += [ "//testing/android/proguard_for_test.flags" ] | 56 proguard_configs += |
| 57 [ "//chrome/android/java/proguard_for_release.flags" ] |
| 58 } else { |
| 59 proguard_configs += [ "//testing/android/proguard_under_test.flags" ] |
| 57 } | 60 } |
| 58 } | 61 } |
| 59 | 62 |
| 60 if (!defined(use_chromium_linker)) { | 63 if (!defined(use_chromium_linker)) { |
| 61 use_chromium_linker = chrome_public_apk_use_chromium_linker | 64 use_chromium_linker = chrome_public_apk_use_chromium_linker |
| 62 } | 65 } |
| 63 | 66 |
| 64 if (use_chromium_linker) { | 67 if (use_chromium_linker) { |
| 65 if (!defined(load_library_from_apk)) { | 68 if (!defined(load_library_from_apk)) { |
| 66 load_library_from_apk = chrome_public_apk_load_library_from_apk | 69 load_library_from_apk = chrome_public_apk_load_library_from_apk |
| 67 } | 70 } |
| 68 | 71 |
| 69 if (!defined(enable_relocation_packing)) { | 72 if (!defined(enable_relocation_packing)) { |
| 70 enable_relocation_packing = chrome_public_apk_use_relocation_packer | 73 enable_relocation_packing = chrome_public_apk_use_relocation_packer |
| 71 } | 74 } |
| 72 } | 75 } |
| 73 } | 76 } |
| 74 } | 77 } |
| OLD | NEW |