diff options
| author | agrieve <agrieve@chromium.org> | 2015-09-03 20:08:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-04 03:09:10 +0000 |
| commit | 6c26dd145dffde7cc1a5d0025ed2b5fd35cc6bae (patch) | |
| tree | c6ceb2387baac4d5e5a4859f0003bda0e82dba2d /build/config/android/internal_rules.gni | |
| parent | 90ae5a86e4c27d864053f7ccf05baa0699eb8c76 (diff) | |
| download | chromium_src-6c26dd145dffde7cc1a5d0025ed2b5fd35cc6bae.zip chromium_src-6c26dd145dffde7cc1a5d0025ed2b5fd35cc6bae.tar.gz chromium_src-6c26dd145dffde7cc1a5d0025ed2b5fd35cc6bae.tar.bz2 | |
GN: Stop setting android.jar in both -classpath and -bootclasspath
I don't think it's necessary.
BUG=
Review URL: https://codereview.chromium.org/1328793003
Cr-Commit-Position: refs/heads/master@{#347330}
Diffstat (limited to 'build/config/android/internal_rules.gni')
| -rw-r--r-- | build/config/android/internal_rules.gni | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 1bc02b2..76f3b3c 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1054,11 +1054,6 @@ template("compile_java") { # Mark srcjar_deps as used. assert(_srcjar_deps == [] || true) - _system_jars = [] - if (defined(invoker.android) && invoker.android) { - _system_jars += [ android_sdk_jar ] - } - _rebased_build_config = rebase_path(_build_config, root_build_dir) _rebased_jar_path = rebase_path(_intermediate_jar_path, root_build_dir) @@ -1080,14 +1075,14 @@ template("compile_java") { _intermediate_jar_path + ".md5.stamp", ] sources = _java_files + _java_srcjars - inputs = _system_jars + [ _build_config ] + inputs = [ + _build_config, + ] - _rebased_system_jars = rebase_path(_system_jars, root_build_dir) _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir) _rebased_depfile = rebase_path(depfile, root_build_dir) args = [ "--depfile=$_rebased_depfile", - "--classpath=$_rebased_system_jars", "--classpath=@FileArg($_rebased_build_config:javac:classpath)", "--jar-path=$_rebased_jar_path", "--java-srcjars=$_rebased_java_srcjars", @@ -1165,6 +1160,7 @@ template("java_library_impl") { defined(invoker.supports_android) && invoker.supports_android _requires_android = defined(invoker.requires_android) && invoker.requires_android + assert(_requires_android || true) # Mark as used. if (_supports_android) { _dex_path = _base_path + ".dex.jar" @@ -1265,8 +1261,6 @@ template("java_library_impl") { srcjar_deps = _srcjar_deps srcjars = _srcjars chromium_code = _chromium_code - android = _requires_android - supports_android = _supports_android deps = build_config_deps } |