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