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

Side by Side Diff: remoting/android/remoting_apk_tmpl.gni

Issue 1582423003: Fix remoting_apk compile when is_component_build = true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remoting-3
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « remoting/android/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 if (!is_component_build) { 7 template("remoting_apk_tmpl") {
8 template("remoting_apk_tmpl") { 8 android_apk(target_name) {
9 android_apk(target_name) { 9 forward_variables_from(invoker, "*")
10 forward_variables_from(invoker, "*")
11 10
12 android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" 11 android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
13 native_libs = [ "libremoting_client_jni.so" ] 12 native_libs = [ "libremoting_client_jni.so" ]
14 13
15 deps += [ 14 deps += [
16 "//remoting/android:remoting_apk_manifest", 15 "//remoting/android:remoting_apk_manifest",
17 "//remoting/android:remoting_client_jni", 16 "//remoting/android:remoting_client_jni",
18 ] 17 ]
19 18
20 if (target_cpu == "arm") { 19 if (target_cpu == "arm") {
21 deps += [ "//remoting/android:remoting_cardboard_extract_native_lib" ] 20 deps += [ "//remoting/android:remoting_cardboard_extract_native_lib" ]
22 native_libs += [ "libvrtoolkit.so" ] 21 loadable_modules = [ "$root_out_dir/libvrtoolkit.so" ]
23 }
24 } 22 }
25 } 23 }
26 } 24 }
OLDNEW
« no previous file with comments | « remoting/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698