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

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

Issue 2044223005: [Android] Add option to add additional files to built jars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« build/android/gyp/javac.py ('K') | « build/android/gyp/javac.py ('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 88526416b446a22eff2d6f884ef3fec9206ba65d..db6790b3e3cc9ce3f28f486a3f08cdbadb373cd1 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1520,7 +1520,7 @@ template("compile_java") {
_enable_interface_jars_javac = true
if (defined(invoker.processors_javac)) {
_processors = invoker.processors_javac
- _enable_iterface_jars_javac = _processors == []
+ _enable_interface_jars_javac = _processors == []
}
_processor_args = []
@@ -1528,6 +1528,11 @@ template("compile_java") {
_processor_args = invoker.processor_args_javac
}
+ _additional_jar_files = []
+ if (defined(invoker.additional_jar_files)) {
+ _additional_jar_files = invoker.additional_jar_files
+ }
+
if (defined(invoker.enable_incremental_javac_override)) {
# Use invoker-specified override.
_enable_incremental_javac = invoker.enable_incremental_javac_override
@@ -1642,6 +1647,9 @@ template("compile_java") {
foreach(e, _processor_args) {
args += [ "--processor-arg=" + e ]
}
+ foreach(e, _additional_jar_files) {
+ args += [ "--additional-jar-file=" + e ]
+ }
args += rebase_path(_java_files, root_build_dir)
}
@@ -1812,6 +1820,7 @@ template("java_library_impl") {
compile_java(_compile_java_target) {
forward_variables_from(invoker,
[
+ "additional_jar_files",
"alternative_android_sdk_ijar",
"alternative_android_sdk_ijar_dep",
"dist_jar_path",
« build/android/gyp/javac.py ('K') | « build/android/gyp/javac.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698