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

Side by Side Diff: build/config/android/rules.gni

Issue 2101033002: Remove proguard specific override block (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added assert to keep constraint Created 4 years, 5 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 | « no previous file | 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/internal_rules.gni") 6 import("//build/config/android/internal_rules.gni")
7 import("//build/toolchain/toolchain.gni") 7 import("//build/toolchain/toolchain.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 2309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2320 } 2320 }
2321 } 2321 }
2322 2322
2323 android_apk(target_name) { 2323 android_apk(target_name) {
2324 set_sources_assignment_filter([]) 2324 set_sources_assignment_filter([])
2325 data_deps = [] 2325 data_deps = []
2326 deps = [] 2326 deps = []
2327 forward_variables_from(invoker, "*") 2327 forward_variables_from(invoker, "*")
2328 testonly = true 2328 testonly = true
2329 2329
2330 if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) { 2330 assert(!defined(invoker.proguard_enabled) || !invoker.proguard_enabled
2331 assert(invoker.proguard_configs != []) 2331 || invoker.proguard_configs != [])
2332 proguard_enabled = true
2333 proguard_configs = invoker.proguard_configs
2334 }
2335 2332
2336 if (!defined(apk_name)) { 2333 if (!defined(apk_name)) {
2337 apk_name = get_label_info(invoker.shared_library, "name") 2334 apk_name = get_label_info(invoker.shared_library, "name")
2338 } 2335 }
2339 2336
2340 if (!defined(android_manifest)) { 2337 if (!defined(android_manifest)) {
2341 android_manifest_dep = ":${target_name}_manifest" 2338 android_manifest_dep = ":${target_name}_manifest"
2342 android_manifest = _android_manifest 2339 android_manifest = _android_manifest
2343 } 2340 }
2344 2341
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 android_library(target_name) { 2490 android_library(target_name) {
2494 chromium_code = false 2491 chromium_code = false
2495 java_files = [] 2492 java_files = []
2496 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2493 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2497 deps = [ 2494 deps = [
2498 "//third_party/android_protobuf:protobuf_nano_javalib", 2495 "//third_party/android_protobuf:protobuf_nano_javalib",
2499 ] 2496 ]
2500 } 2497 }
2501 } 2498 }
2502 } 2499 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698