diff options
| author | ohrn <ohrn@opera.com> | 2015-07-08 06:09:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-08 13:09:48 +0000 |
| commit | 718538ef3a6e6f7104101ef37502052c88c5641c (patch) | |
| tree | 20c4d412cd1a2916e84c34eec3b74f0d99768141 /build/config/android/internal_rules.gni | |
| parent | 452009a40b27e551a780954ab5c1e34cbe0f7b66 (diff) | |
| download | chromium_src-718538ef3a6e6f7104101ef37502052c88c5641c.zip chromium_src-718538ef3a6e6f7104101ef37502052c88c5641c.tar.gz chromium_src-718538ef3a6e6f7104101ef37502052c88c5641c.tar.bz2 | |
Add -bootclasspath argument to javac.
This silences the warning "bootstrap class path not set in conjunction
with -source 1.7" when building with OpenJDK 1.8.
The multiple_proguards test was removed as javac will now catch the use
of host packages that do not exist on Android.
BUG=
Review URL: https://codereview.chromium.org/1213433007
Cr-Commit-Position: refs/heads/master@{#337805}
Diffstat (limited to 'build/config/android/internal_rules.gni')
| -rw-r--r-- | build/config/android/internal_rules.gni | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index b864dd5..630d0e6 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1002,11 +1002,13 @@ template("compile_java") { sources = _java_files + _java_srcjars inputs = _system_jars + [ _build_config ] + _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir) _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", + "--bootclasspath=$_rebased_android_sdk_jar", "--classpath=$_rebased_system_jars", "--classpath=@FileArg($_rebased_build_config:javac:classpath)", "--jar-path=$_rebased_jar_path", |