diff options
-rw-r--r-- | remoting/BUILD.gn | 2 | ||||
-rw-r--r-- | remoting/android/BUILD.gn | 2 | ||||
-rw-r--r-- | remoting/android/remoting_apk_tmpl.gni | 26 |
3 files changed, 13 insertions, 17 deletions
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 2dbbecf..155af30 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -41,7 +41,7 @@ group("remoting_all") { ] } - if (is_android && !is_component_build) { + if (is_android) { deps += [ "//remoting/android:remoting_apk", "//remoting/android:remoting_test_apk", diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn index e4542d1..a933e3d 100644 --- a/remoting/android/BUILD.gn +++ b/remoting/android/BUILD.gn @@ -9,8 +9,6 @@ import("//remoting/android/remoting_apk_tmpl.gni") import("//remoting/remoting_options.gni") import("//remoting/tools/build/remoting_localize.gni") -assert(!is_component_build, "Remoting requires static library build.") - generate_jni("jni_headers") { sources = [ "java/src/org/chromium/chromoting/jni/Client.java", diff --git a/remoting/android/remoting_apk_tmpl.gni b/remoting/android/remoting_apk_tmpl.gni index bc440c3..ee2f5b5 100644 --- a/remoting/android/remoting_apk_tmpl.gni +++ b/remoting/android/remoting_apk_tmpl.gni @@ -4,23 +4,21 @@ import("//build/config/android/rules.gni") -if (!is_component_build) { - template("remoting_apk_tmpl") { - android_apk(target_name) { - forward_variables_from(invoker, "*") +template("remoting_apk_tmpl") { + android_apk(target_name) { + forward_variables_from(invoker, "*") - android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" - native_libs = [ "libremoting_client_jni.so" ] + android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" + native_libs = [ "libremoting_client_jni.so" ] - deps += [ - "//remoting/android:remoting_apk_manifest", - "//remoting/android:remoting_client_jni", - ] + deps += [ + "//remoting/android:remoting_apk_manifest", + "//remoting/android:remoting_client_jni", + ] - if (target_cpu == "arm") { - deps += [ "//remoting/android:remoting_cardboard_extract_native_lib" ] - native_libs += [ "libvrtoolkit.so" ] - } + if (target_cpu == "arm") { + deps += [ "//remoting/android:remoting_cardboard_extract_native_lib" ] + loadable_modules = [ "$root_out_dir/libvrtoolkit.so" ] } } } |