Skip to content

Commit

Permalink
Added gvr-android-sdk to third_party/
Browse files Browse the repository at this point in the history
BUG=389343

Review-Url: https://codereview.chromium.org/2106243003
Cr-Commit-Position: refs/heads/master@{#410405}
  • Loading branch information
toji authored and Commit bot committed Aug 8, 2016
1 parent 86cd5c0 commit c690d9a
Show file tree
Hide file tree
Showing 6 changed files with 7,572 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ vs-chromium-project.txt
/third_party/google_appengine_cloudstorage
/third_party/google_toolbox_for_mac/src
/third_party/googlemac
/third_party/gvr-android-sdk/src
/third_party/gperf
/third_party/grpc
/third_party/guava/lib/*.jar
Expand Down
3 changes: 3 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,9 @@ deps_os = {

'src/third_party/custom_tabs_client/src':
Var('chromium_git') + '/external/github.com/GoogleChrome/custom-tabs-client.git' + '@' + '2d896e8578f12ce85b804cab9e8f7e6e8c1bab7d',

'src/third_party/gvr-android-sdk/src':
Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + 'cff15311c7c1abbe77b3c714135dccc2009ee473',
},
}

Expand Down
52 changes: 52 additions & 0 deletions third_party/gvr-android-sdk/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/android/rules.gni")

android_aar_prebuilt("gvr_common_java") {
aar_path = "src/ndk-beta/lib/common_library.aar"
jar_excluded_patterns = [ "*/protobuf/*" ]
}

android_aar_prebuilt("gvr_base_java") {
aar_path = "src/libraries/base/base.aar"
}

android_aar_prebuilt("gvr_controller_java") {
aar_path = "src/libraries/controller/controller.aar"
}

source_set("libgvr") {
deps = [
":libgvr_shared_library",
]
libs = [ "$root_out_dir/libgvr.so" ]
}

copy("libgvr_shared_library") {
if (target_cpu == "arm") {
sources = [
"src/ndk-beta/lib/android_arm/libgvr.so",
]
} else if (target_cpu == "arm64") {
sources = [
"src/ndk-beta/lib/android_arm64/libgvr.so",
]
} else if (target_cpu == "x86") {
sources = [
"src/ndk-beta/lib/android_x86/libgvr.so",
]
} else if (target_cpu == "x64") {
sources = [
"src/ndk-beta/lib/android_x86_64/libgvr.so",
]
}
outputs = [
"${root_out_dir}/libgvr.so",
]
}

config("libgvr_config") {
include_dirs = [ "src/ndk-beta/include/" ]
}
Loading

0 comments on commit c690d9a

Please sign in to comment.