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

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

Issue 1072193011: Enforce that apk_under_test is used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-dex-test-exclude
Patch Set: Created 5 years, 8 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 | « build/android/gyp/write_build_config.py ('k') | build/config/android/rules.gni » ('j') | 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 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 args += [ 307 args += [
308 "--resources-zip", 308 "--resources-zip",
309 rebase_path(invoker.resources_zip, root_build_dir), 309 rebase_path(invoker.resources_zip, root_build_dir),
310 ] 310 ]
311 if (defined(invoker.android_manifest)) { 311 if (defined(invoker.android_manifest)) {
312 inputs += [ invoker.android_manifest ] 312 inputs += [ invoker.android_manifest ]
313 args += [ 313 args += [
314 "--android-manifest", 314 "--android-manifest",
315 rebase_path(invoker.android_manifest, root_build_dir), 315 rebase_path(invoker.android_manifest, root_build_dir),
316 ] 316 ]
317 } else {
318 assert(!is_apk, "apk build configs require an android_manifest")
317 } 319 }
318 if (defined(invoker.custom_package)) { 320 if (defined(invoker.custom_package)) {
319 args += [ 321 args += [
320 "--package-name", 322 "--package-name",
321 invoker.custom_package, 323 invoker.custom_package,
322 ] 324 ]
323 } 325 }
324 } 326 }
325 327
326 if (is_apk) { 328 if (is_apk) {
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 ] 1154 ]
1153 output = invoker.dex_path 1155 output = invoker.dex_path
1154 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files" 1156 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
1155 args = [ "--inputs=@FileArg($dex_arg_key)" ] 1157 args = [ "--inputs=@FileArg($dex_arg_key)" ]
1156 if (defined(invoker.excluded_jars)) { 1158 if (defined(invoker.excluded_jars)) {
1157 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir) 1159 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir)
1158 args += [ "--excluded-paths=${excluded_jars}" ] 1160 args += [ "--excluded-paths=${excluded_jars}" ]
1159 } 1161 }
1160 } 1162 }
1161 } 1163 }
OLDNEW
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698