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

Side by Side Diff: third_party/gvr-android-sdk/BUILD.gn

Issue 2490003003: Remove gvr SDK dependency (Closed)
Patch Set: rebase Created 4 years, 1 month 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 | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 gvr_arch = current_cpu 7 gvr_arch = current_cpu
8 if (gvr_arch == "x64") { 8 if (gvr_arch == "x64") {
9 gvr_arch = "x86_64" 9 gvr_arch = "x86_64"
10 } 10 }
11 11
12 android_aar_prebuilt("gvr_common_java") { 12 android_aar_prebuilt("gvr_common_java") {
13 aar_path = "src/ndk/lib/common_library.aar" 13 aar_path = "src/ndk/lib/common_library.aar"
14 }
15
16 android_aar_prebuilt("gvr_base_java") {
17 aar_path = "src/libraries/base/base.aar"
18 proguard_configs = [ "src/proguard-gvr.txt" ] 14 proguard_configs = [ "src/proguard-gvr.txt" ]
19 ignore_manifest = true # Ignored because manifest merging is not supported (h ttp://crbug.com/643967) 15 ignore_manifest = true # Ignored because manifest merging is not supported (h ttp://crbug.com/643967)
20 ignore_native_libraries = true 16 ignore_native_libraries = true
21 } 17 }
22 18
23 android_aar_prebuilt("gvr_controller_java") { 19 android_aar_prebuilt("gvr_controller_java") {
24 aar_path = "src/libraries/controller/controller.aar" 20 aar_path = "src/libraries/controller/controller.aar"
25 } 21 }
26 22
27 source_set("libgvr") { 23 source_set("libgvr") {
(...skipping 12 matching lines...) Expand all
40 ] 36 ]
41 outputs = [ 37 outputs = [
42 "${root_out_dir}/libgvr.so", 38 "${root_out_dir}/libgvr.so",
43 ] 39 ]
44 } 40 }
45 } 41 }
46 42
47 config("libgvr_config") { 43 config("libgvr_config") {
48 include_dirs = [ "src/ndk/include/" ] 44 include_dirs = [ "src/ndk/include/" ]
49 } 45 }
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698