| 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 android_aar_prebuilt("gvr_common_java") { | 7 android_aar_prebuilt("gvr_common_java") { |
| 8 aar_path = "common_library.aar" | 8 aar_path = "common_library.aar" |
| 9 proguard_configs = [ "src/proguard-gvr.txt" ] | 9 proguard_configs = [ "src/proguard-gvr.txt" ] |
| 10 ignore_manifest = true # Ignored because manifest merging is not supported (h
ttp://crbug.com/643967) | 10 ignore_manifest = true # Ignored because manifest merging is not supported (h
ttp://crbug.com/643967) |
| 11 ignore_native_libraries = true | 11 ignore_native_libraries = true |
| 12 } | 12 } |
| 13 | 13 |
| 14 android_aar_prebuilt("gvr_controller_java") { | 14 android_aar_prebuilt("gvr_controller_java") { |
| 15 aar_path = "src/libraries/controller/controller.aar" | 15 aar_path = "src/libraries/sdk-controller-1.10.0.aar" |
| 16 } | 16 } |
| 17 | 17 |
| 18 config("libgvr_config") { | 18 config("libgvr_config") { |
| 19 include_dirs = [ "src/ndk/include/" ] | 19 include_dirs = [ "src/libraries/headers/" ] |
| 20 } | 20 } |
| OLD | NEW |