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

Unified Diff: build/config/android/internal_rules.gni

Issue 2759963002: Enable Java 8 by default
Patch Set: Add example usage Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index d2d9f998b3d7d387b9a38ae1dd94f46d1b9c3461..7029647ed32e0c54bd7958ad3f9dcb81fe7d6c50 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1052,8 +1052,7 @@ if (enable_java_templates) {
defined(invoker.supports_android) && invoker.supports_android &&
(is_java_debug || dcheck_always_on)
- _retrolambda = defined(invoker.supports_android) &&
- invoker.supports_android && use_java8
+ _retrolambda = defined(invoker.supports_android) && invoker.supports_android
_deps = []
_previous_output_jar = _input_jar_path
@@ -2078,6 +2077,7 @@ if (enable_java_templates) {
"--jar-path=$_rebased_jar_path",
"--java-srcjars=$_rebased_java_srcjars",
"--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
+ "--java-version=1.8",
]
if (_enable_interface_jars_javac) {
args += [ "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)" ]
@@ -2104,11 +2104,6 @@ if (enable_java_templates) {
rebase_path(_android_sdk_ijar, root_build_dir)
args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ]
}
- if (use_java8) {
- args += [ "--java-version=1.8" ]
- } else if (_supports_android) {
- args += [ "--java-version=1.7" ]
- }
foreach(e, _manifest_entries) {
args += [ "--manifest-entry=" + e ]
}
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698