diff options
| author | agrieve <agrieve@chromium.org> | 2016-01-15 12:39:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 20:40:34 +0000 |
| commit | 50ad1bb89bf7a4ab1435820d7b72c2466dccc6a6 (patch) | |
| tree | c3d05912564ca7d5b161d3bc81c738c89bb1b40c /remoting/android | |
| parent | 590c23ee15c775c40a2b4c127a8f5ca25789d6ef (diff) | |
| download | chromium_src-50ad1bb89bf7a4ab1435820d7b72c2466dccc6a6.zip chromium_src-50ad1bb89bf7a4ab1435820d7b72c2466dccc6a6.tar.gz chromium_src-50ad1bb89bf7a4ab1435820d7b72c2466dccc6a6.tar.bz2 | |
Fix remoting_apk compile when is_component_build = true
Verified that tests pass.
BUG=577961
Review URL: https://codereview.chromium.org/1582423003
Cr-Commit-Position: refs/heads/master@{#369834}
Diffstat (limited to 'remoting/android')
| -rw-r--r-- | remoting/android/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/android/remoting_apk_tmpl.gni | 26 |
2 files changed, 12 insertions, 16 deletions
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" ] } } } |