commit 123ff890c38af21cfa213a06b94b25532cb9b874
author Jiwen 'Steve' Cai <jwcai@google.com> Sat Jan 28 20:44:35 2017 -0800
committer Gaurav Shah <gauravsh@google.com> Sun Jan 29 08:00:18 2017 +0000
tree d746f3c6e6b0d4c572a2ce2b439e7202b52869ee
parent e4eec20f6263f4a42ae462456f60ea6c4518bb0a

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

libs/vr/libgvr/Android.mk

diff --git a/libs/vr/libgvr/Android.mk b/libs/vr/libgvr/Android.mk
index bcb3961..b287807 100644
--- a/libs/vr/libgvr/Android.mk
+++ b/libs/vr/libgvr/Android.mk
@@ -91,8 +91,11 @@
 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_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