OLD | NEW |
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-beta/lib/common_library.aar" |
| 14 jar_excluded_patterns = [ "*/protobuf/*" ] |
14 } | 15 } |
15 | 16 |
16 android_aar_prebuilt("gvr_base_java") { | 17 android_aar_prebuilt("gvr_base_java") { |
17 aar_path = "src/libraries/base/base.aar" | 18 aar_path = "src/libraries/base/base.aar" |
18 proguard_configs = [ "src/proguard-gvr.txt" ] | 19 proguard_configs = [ "proguard/base.flags" ] |
19 ignore_manifest = true # Ignored because manifest merging is not supported (h
ttp://crbug.com/643967) | 20 ignore_manifest = true # Ignored because manifest merging is not supported (h
ttp://crbug.com/643967) |
20 ignore_native_libraries = true | 21 ignore_native_libraries = true |
21 } | 22 } |
22 | 23 |
23 android_aar_prebuilt("gvr_controller_java") { | 24 android_aar_prebuilt("gvr_controller_java") { |
24 aar_path = "src/libraries/controller/controller.aar" | 25 aar_path = "src/libraries/controller/controller.aar" |
25 } | 26 } |
26 | 27 |
27 source_set("libgvr") { | 28 source_set("libgvr") { |
28 if (gvr_arch != "mipsel") { | 29 if (gvr_arch != "mipsel") { |
29 data_deps = [ | 30 data_deps = [ |
30 ":libgvr_copy", | 31 ":libgvr_copy", |
31 ] | 32 ] |
32 libs = [ "${root_out_dir}/libgvr.so" ] | 33 libs = [ "${root_out_dir}/libgvr.so" ] |
33 } | 34 } |
34 } | 35 } |
35 | 36 |
36 if (gvr_arch != "mipsel") { | 37 if (gvr_arch != "mipsel") { |
37 copy("libgvr_copy") { | 38 copy("libgvr_copy") { |
38 sources = [ | 39 sources = [ |
39 "src/ndk/lib/android_${gvr_arch}/libgvr.so", | 40 "src/ndk-beta/lib/android_${gvr_arch}/libgvr.so", |
40 ] | 41 ] |
41 outputs = [ | 42 outputs = [ |
42 "${root_out_dir}/libgvr.so", | 43 "${root_out_dir}/libgvr.so", |
43 ] | 44 ] |
44 } | 45 } |
45 } | 46 } |
46 | 47 |
47 config("libgvr_config") { | 48 config("libgvr_config") { |
48 include_dirs = [ "src/ndk/include/" ] | 49 include_dirs = [ "src/ndk-beta/include/" ] |
49 } | 50 } |
OLD | NEW |