commit 37bc82ac64f58da9d3b0692c92e06421daaf541a
author Chris Forbes <chrisforbes@google.com> Wed May 29 14:50:33 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Wed May 29 23:01:15 2019 +0000
tree aa3104c2475c55c5c5b2c2d9aef2f2c37f9ebd42
parent 4963b9534e4fdee87114c7c1f790500d48bc4d24

Enable arm32 build for pastel

Change-Id: I95825844509af7a30600fe48752b3f5cef10d017
Bug: b/129979580
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32208
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index ced6649..edb927a 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -675,12 +675,6 @@
 cc_library_shared {
     name: "vulkan.pastel",
 
-    target: {
-        android_arm: {
-            enabled: false
-        },
-    },
-
     static_libs: [
         "libswiftshadervk_llvm_debug",
         "libLLVM7_swiftshader",
@@ -697,12 +691,6 @@
 cc_library_shared {
     name: "vulkan.pastel.debug",
 
-    target: {
-        android_arm: {
-            enabled: false
-        },
-    },
-
     static_libs: [
         "libswiftshadervk_llvm_debug",
         "libLLVM7_swiftshader",

src/Vulkan/VkGetProcAddress.cpp

diff --git a/src/Vulkan/VkGetProcAddress.cpp b/src/Vulkan/VkGetProcAddress.cpp
index fbab0bd..308c0b5 100644
--- a/src/Vulkan/VkGetProcAddress.cpp
+++ b/src/Vulkan/VkGetProcAddress.cpp
@@ -400,7 +400,7 @@
 		},
 		.EnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties,
 		.CreateInstance = vkCreateInstance,
-		.GetInstanceProcAddr = vk::GetInstanceProcAddr,
+		.GetInstanceProcAddr = vkGetInstanceProcAddr,
 	};
 
 	int OpenDevice(const hw_module_t *module, const char *id, hw_device_t **device)