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

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

Issue 910143003: Change in android Java build rules for Mojo Java content handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/android/gyp/javac.py ('k') | build/config/android/rules.gni » ('j') | 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 125aa2cd17cb0eb71a62c41437046bd9a4acc642..c31d40eca76c4597f5b622c469e2bf58330edd0d 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -665,6 +665,10 @@ template("compile_java") {
if (defined(invoker.chromium_code)) {
_chromium_code = invoker.chromium_code
}
+ _manifest_entries = []
+ if (defined(invoker.manifest_entries)) {
+ _manifest_entries = invoker.manifest_entries
+ }
_srcjar_deps = []
if (defined(invoker.srcjar_deps)) {
@@ -718,6 +722,9 @@ template("compile_java") {
"--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
"--jar-excluded-classes=$_jar_excluded_patterns",
]
+ foreach(e, _manifest_entries) {
+ args += [ "--manifest-entry=" + e ]
+ }
if (_chromium_code) {
args += [ "--chromium-code=1" ]
}
@@ -861,6 +868,9 @@ template("java_library_impl") {
if (defined(invoker.dist_jar_path)) {
dist_jar_path = invoker.dist_jar_path
}
+ if (defined(invoker.manifest_entries)) {
+ manifest_entries = invoker.manifest_entries
+ }
}
if (defined(invoker.main_class)) {
« no previous file with comments | « build/android/gyp/javac.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698