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

Unified Diff: mojo/public/mojo_application.gni

Issue 1227953007: Fix mojo_android_application when there is no java sources. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index ee30d89a5039edcaaa504d723ad480fde71bb56b..822b51d09aae42cc12cc8f200590f156fc39dd9b 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -327,8 +327,13 @@ if (is_android) {
template("mojo_android_application") {
shared_library_name = "__${target_name}_lib"
library_basename = "lib${shared_library_name}.so"
- generate_jni_name = "__${target_name}_jni"
- java_library_name = "__${target_name}_java"
+ if (defined(invoker.jni_package)) {
+ assert(defined(invoker.java_sources))
+ generate_jni_name = "__${target_name}_jni"
+ }
+ if (defined(invoker.java_sources)) {
+ java_library_name = "__${target_name}_java"
+ }
android_standalone_library_name = "__${target_name}_java_lib"
dex_output_path = "${target_gen_dir}/${target_name}.dex"
zip_action_name = "__${target_name}_zip"
@@ -336,7 +341,7 @@ if (is_android) {
copy_symbols_target = "__${target_name}_copy_symbols"
final_target_name = target_name
- if (defined(invoker.java_sources) && defined(invoker.jni_package)) {
+ if (defined(invoker.jni_package)) {
generate_jni(generate_jni_name) {
visibility = [ ":${shared_library_name}" ]
@@ -356,7 +361,7 @@ if (is_android) {
}
deps = []
- if (defined(invoker.java_sources) && defined(invoker.jni_package)) {
+ if (defined(invoker.jni_package)) {
deps += [ ":${generate_jni_name}" ]
}
if (defined(invoker.deps)) {
@@ -378,22 +383,24 @@ if (is_android) {
]
}
- android_library(java_library_name) {
- visibility = [ ":*" ]
+ if (defined(invoker.java_sources)) {
+ android_library(java_library_name) {
+ visibility = [ ":*" ]
- if (defined(invoker.java_sources)) {
java_files = invoker.java_sources
- }
- if (defined(invoker.java_deps)) {
- deps = invoker.java_deps
+ if (defined(invoker.java_deps)) {
+ deps = invoker.java_deps
+ }
}
}
android_standalone_library(android_standalone_library_name) {
- deps = [
- ":${java_library_name}",
- ]
+ deps = []
+
+ if (defined(invoker.java_sources)) {
+ deps += [ ":${java_library_name}" ]
+ }
if (defined(invoker.java_deps)) {
deps += invoker.java_deps
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698