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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/dcheck_always_on.gni") 9 import("//build/config/dcheck_always_on.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 _jar_excluded_patterns = invoker.jar_excluded_patterns 1045 _jar_excluded_patterns = invoker.jar_excluded_patterns
1046 } 1046 }
1047 _strip_resource_classes = defined(invoker.strip_resource_classes) && 1047 _strip_resource_classes = defined(invoker.strip_resource_classes) &&
1048 invoker.strip_resource_classes 1048 invoker.strip_resource_classes
1049 _filter_jar = _jar_excluded_patterns != [] || _strip_resource_classes 1049 _filter_jar = _jar_excluded_patterns != [] || _strip_resource_classes
1050 1050
1051 _enable_assert = 1051 _enable_assert =
1052 defined(invoker.supports_android) && invoker.supports_android && 1052 defined(invoker.supports_android) && invoker.supports_android &&
1053 (is_java_debug || dcheck_always_on) 1053 (is_java_debug || dcheck_always_on)
1054 1054
1055 _retrolambda = defined(invoker.supports_android) && 1055 _retrolambda = defined(invoker.supports_android) && invoker.supports_android
1056 invoker.supports_android && use_java8
1057 1056
1058 _deps = [] 1057 _deps = []
1059 _previous_output_jar = _input_jar_path 1058 _previous_output_jar = _input_jar_path
1060 1059
1061 if (_filter_jar) { 1060 if (_filter_jar) {
1062 _filter_target = "${target_name}__filter" 1061 _filter_target = "${target_name}__filter"
1063 _filter_input_jar = _previous_output_jar 1062 _filter_input_jar = _previous_output_jar
1064 _filter_output_jar = "$target_out_dir/$target_name-filtered.jar" 1063 _filter_output_jar = "$target_out_dir/$target_name-filtered.jar"
1065 1064
1066 action(_filter_target) { 1065 action(_filter_target) {
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 inputs += [ invoker.java_sources_file ] 2070 inputs += [ invoker.java_sources_file ]
2072 } 2071 }
2073 2072
2074 _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir) 2073 _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir)
2075 _rebased_depfile = rebase_path(depfile, root_build_dir) 2074 _rebased_depfile = rebase_path(depfile, root_build_dir)
2076 args = [ 2075 args = [
2077 "--depfile=$_rebased_depfile", 2076 "--depfile=$_rebased_depfile",
2078 "--jar-path=$_rebased_jar_path", 2077 "--jar-path=$_rebased_jar_path",
2079 "--java-srcjars=$_rebased_java_srcjars", 2078 "--java-srcjars=$_rebased_java_srcjars",
2080 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 2079 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
2080 "--java-version=1.8",
2081 ] 2081 ]
2082 if (_enable_interface_jars_javac) { 2082 if (_enable_interface_jars_javac) {
2083 args += [ "--classpath=@FileArg($_rebased_build_config:javac:interface_c lasspath)" ] 2083 args += [ "--classpath=@FileArg($_rebased_build_config:javac:interface_c lasspath)" ]
2084 } else { 2084 } else {
2085 args += 2085 args +=
2086 [ "--classpath=@FileArg($_rebased_build_config:javac:classpath)" ] 2086 [ "--classpath=@FileArg($_rebased_build_config:javac:classpath)" ]
2087 } 2087 }
2088 if (_enable_incremental_javac) { 2088 if (_enable_incremental_javac) {
2089 args += [ "--incremental" ] 2089 args += [ "--incremental" ]
2090 deps += [ "//third_party/jmake($default_toolchain)" ] 2090 deps += [ "//third_party/jmake($default_toolchain)" ]
2091 inputs += [ "$root_build_dir/bin/jmake" ] 2091 inputs += [ "$root_build_dir/bin/jmake" ]
2092 outputs += [ "${_javac_jar_path}.pdb" ] 2092 outputs += [ "${_javac_jar_path}.pdb" ]
2093 } 2093 }
2094 if (_requires_android) { 2094 if (_requires_android) {
2095 if (defined(invoker.alternative_android_sdk_ijar)) { 2095 if (defined(invoker.alternative_android_sdk_ijar)) {
2096 deps += [ invoker.alternative_android_sdk_ijar_dep ] 2096 deps += [ invoker.alternative_android_sdk_ijar_dep ]
2097 _android_sdk_ijar = invoker.alternative_android_sdk_ijar 2097 _android_sdk_ijar = invoker.alternative_android_sdk_ijar
2098 } else { 2098 } else {
2099 deps += [ "//build/android:android_ijar" ] 2099 deps += [ "//build/android:android_ijar" ]
2100 _android_sdk_ijar = "$root_out_dir/lib.java/android.interface.jar" 2100 _android_sdk_ijar = "$root_out_dir/lib.java/android.interface.jar"
2101 } 2101 }
2102 inputs += [ _android_sdk_ijar ] 2102 inputs += [ _android_sdk_ijar ]
2103 _rebased_android_sdk_ijar = 2103 _rebased_android_sdk_ijar =
2104 rebase_path(_android_sdk_ijar, root_build_dir) 2104 rebase_path(_android_sdk_ijar, root_build_dir)
2105 args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ] 2105 args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ]
2106 } 2106 }
2107 if (use_java8) {
2108 args += [ "--java-version=1.8" ]
2109 } else if (_supports_android) {
2110 args += [ "--java-version=1.7" ]
2111 }
2112 foreach(e, _manifest_entries) { 2107 foreach(e, _manifest_entries) {
2113 args += [ "--manifest-entry=" + e ] 2108 args += [ "--manifest-entry=" + e ]
2114 } 2109 }
2115 if (_chromium_code) { 2110 if (_chromium_code) {
2116 args += [ "--chromium-code=1" ] 2111 args += [ "--chromium-code=1" ]
2117 } 2112 }
2118 if (_enable_errorprone) { 2113 if (_enable_errorprone) {
2119 deps += [ "//third_party/errorprone:chromium_errorprone" ] 2114 deps += [ "//third_party/errorprone:chromium_errorprone" ]
2120 args += [ 2115 args += [
2121 "--use-errorprone-path", 2116 "--use-errorprone-path",
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
2774 rebase_path(root_build_dir, root_build_dir), 2769 rebase_path(root_build_dir, root_build_dir),
2775 "--packed-libraries-dir", 2770 "--packed-libraries-dir",
2776 rebase_path(_packed_libraries_dir, root_build_dir), 2771 rebase_path(_packed_libraries_dir, root_build_dir),
2777 "--libraries=${invoker.libraries_filearg}", 2772 "--libraries=${invoker.libraries_filearg}",
2778 "--filelistjson", 2773 "--filelistjson",
2779 rebase_path(invoker.file_list_json, root_build_dir), 2774 rebase_path(invoker.file_list_json, root_build_dir),
2780 ] 2775 ]
2781 } 2776 }
2782 } 2777 }
2783 } 2778 }
OLDNEW
« 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