Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 123ff890 authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai Committed by Gaurav Shah
Browse files

Pull in X86 targets for GVR prebuilts CL@144004555 

Also updates the build_gvr_prebuilts.sh script for future prebuilt pull in.

Bug: 34787305
Test: m -j PRODUCT-sdk_google_phone_x86_64-sdk_addon
Test: m -j PRODUCT-sdk_google_phone_mips-sdk_addon

Change-Id: Iba4c4edbdb97f8c2e0e3e6bf054366c2648884fd
parent e4eec20f

libs/vr/libgvr/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -91,8 +91,11 @@ LOCAL_MODULE := libgvr_audio 
LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_SUFFIX := .so

LOCAL_MULTILIB := both

LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64

LOCAL_SRC_FILES_arm := prebuilt/lib/android_arm/libgvr_audio.so

LOCAL_SRC_FILES_arm64 := prebuilt/lib/android_arm64/libgvr_audio.so

LOCAL_SRC_FILES_x86 := prebuilt/lib/android_x86/libgvr_audio.so

LOCAL_SRC_FILES_x86_64 := prebuilt/lib/android_x86_64/libgvr_audio.so

include $(BUILD_PREBUILT)



# Prebuilt shared library for libgvr.so
@@ -102,8 +105,11 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/prebuilt/include 
LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_SUFFIX := .so

LOCAL_MULTILIB := both

LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64

LOCAL_SRC_FILES_arm := prebuilt/lib/android_arm/libgvr.so

LOCAL_SRC_FILES_arm64 := prebuilt/lib/android_arm64/libgvr.so

LOCAL_SRC_FILES_x86 := prebuilt/lib/android_x86/libgvr.so

LOCAL_SRC_FILES_x86_64 := prebuilt/lib/android_x86_64/libgvr.so

include $(BUILD_PREBUILT)



# Prebuilt Java static library for common_library.aar

libs/vr/libgvr/prebuilt/build_gvr_prebuilts.sh

100644 → 100755
+15 −0
Original line number Diff line number Diff line
@@ -55,12 +55,27 @@ function build_gvr_libs() { 
    //vr/gvr/platform:libgvr_audio.so \

    ${BLAZE_COMMON_OPTS[@]} --config=android_arm64 --symlink_prefix blaze-arm64-



    blaze build \

    //java/com/google/vr/sdk/release:common_library.aar \

    //vr/gvr/platform:libgvr.so \

    //vr/gvr/platform:libgvr_audio.so \

    ${BLAZE_COMMON_OPTS[@]} --config=android_x86 --symlink_prefix blaze-x86-



  blaze build \

    //vr/gvr/platform:libgvr.so \

    //vr/gvr/platform:libgvr_audio.so \

    ${BLAZE_COMMON_OPTS[@]} --config=android_x86_64 --symlink_prefix blaze-x86_64-



  copy_file "blaze-arm-genfiles/java/com/google/vr/sdk/release/common_library.aar" \

    "lib/common_library.aar"

  copy_file "blaze-arm-genfiles/vr/gvr/platform/libgvr.so" "lib/android_arm"

  copy_file "blaze-arm-genfiles/vr/gvr/platform/libgvr_audio.so" "lib/android_arm"

  copy_file "blaze-arm64-genfiles/vr/gvr/platform/libgvr.so" "lib/android_arm64"

  copy_file "blaze-arm64-genfiles/vr/gvr/platform/libgvr_audio.so" "lib/android_arm64"

  copy_file "blaze-x86-genfiles/vr/gvr/platform/libgvr.so" "lib/android_x86"

  copy_file "blaze-x86-genfiles/vr/gvr/platform/libgvr_audio.so" "lib/android_x86"

  copy_file "blaze-x86_64-genfiles/vr/gvr/platform/libgvr.so" "lib/android_x86_64"

  copy_file "blaze-x86_64-genfiles/vr/gvr/platform/libgvr_audio.so" "lib/android_x86_64"

}



function main() {

libs/vr/libgvr/prebuilt/lib/android_x86/libgvr.so

0 → 100644
+3.09 MiB

File added.

No diff preview for this file type.

View file

libs/vr/libgvr/prebuilt/lib/android_x86/libgvr_audio.so

0 → 100644
+1.11 MiB

File added.

No diff preview for this file type.

View file

libs/vr/libgvr/prebuilt/lib/android_x86_64/libgvr.so

0 → 100644
+3 MiB

File added.

No diff preview for this file type.

View file