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

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

Issue 1846113002: 🍱 Pass build scripts .interface.jar directly rather than --use-ijars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/zip.gni") 7 import("//build/config/zip.gni")
8 import("//third_party/ijar/ijar.gni") 8 import("//third_party/ijar/ijar.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 ] 1473 ]
1474 sources = _java_files + _java_srcjars 1474 sources = _java_files + _java_srcjars
1475 inputs = [ 1475 inputs = [
1476 _build_config, 1476 _build_config,
1477 ] 1477 ]
1478 1478
1479 _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir) 1479 _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir)
1480 _rebased_depfile = rebase_path(depfile, root_build_dir) 1480 _rebased_depfile = rebase_path(depfile, root_build_dir)
1481 args = [ 1481 args = [
1482 "--depfile=$_rebased_depfile", 1482 "--depfile=$_rebased_depfile",
1483 "--use-ijars", 1483 "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)",
1484 "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
1485 "--jar-path=$_rebased_jar_path", 1484 "--jar-path=$_rebased_jar_path",
1486 "--java-srcjars=$_rebased_java_srcjars", 1485 "--java-srcjars=$_rebased_java_srcjars",
1487 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 1486 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
1488 "--jar-excluded-classes=$_jar_excluded_patterns", 1487 "--jar-excluded-classes=$_jar_excluded_patterns",
1489 ] 1488 ]
1490 if (_enable_incremental_javac) { 1489 if (_enable_incremental_javac) {
1491 args += [ "--incremental" ] 1490 args += [ "--incremental" ]
1492 deps += [ "//third_party/jmake" ] 1491 deps += [ "//third_party/jmake" ]
1493 inputs += [ "$root_out_dir/bin/jmake" ] 1492 inputs += [ "$root_out_dir/bin/jmake" ]
1494 outputs += [ "${_javac_jar_path}.pdb" ] 1493 outputs += [ "${_javac_jar_path}.pdb" ]
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 ] 2174 ]
2176 args = [ 2175 args = [
2177 "--depfile", 2176 "--depfile",
2178 rebase_path(depfile, root_build_dir), 2177 rebase_path(depfile, root_build_dir),
2179 "--script-output-path", 2178 "--script-output-path",
2180 rebase_path(generated_script, root_build_dir), 2179 rebase_path(generated_script, root_build_dir),
2181 ] 2180 ]
2182 args += test_runner_args 2181 args += test_runner_args
2183 } 2182 }
2184 } 2183 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698