Commit 37bc82ac by Chris Forbes

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: 's avatarChris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 4963b953
...@@ -675,12 +675,6 @@ cc_defaults { ...@@ -675,12 +675,6 @@ cc_defaults {
cc_library_shared { cc_library_shared {
name: "vulkan.pastel", name: "vulkan.pastel",
target: {
android_arm: {
enabled: false
},
},
static_libs: [ static_libs: [
"libswiftshadervk_llvm_debug", "libswiftshadervk_llvm_debug",
"libLLVM7_swiftshader", "libLLVM7_swiftshader",
...@@ -697,12 +691,6 @@ cc_library_shared { ...@@ -697,12 +691,6 @@ cc_library_shared {
cc_library_shared { cc_library_shared {
name: "vulkan.pastel.debug", name: "vulkan.pastel.debug",
target: {
android_arm: {
enabled: false
},
},
static_libs: [ static_libs: [
"libswiftshadervk_llvm_debug", "libswiftshadervk_llvm_debug",
"libLLVM7_swiftshader", "libLLVM7_swiftshader",
......
...@@ -400,7 +400,7 @@ namespace { ...@@ -400,7 +400,7 @@ namespace {
}, },
.EnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties, .EnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties,
.CreateInstance = vkCreateInstance, .CreateInstance = vkCreateInstance,
.GetInstanceProcAddr = vk::GetInstanceProcAddr, .GetInstanceProcAddr = vkGetInstanceProcAddr,
}; };
int OpenDevice(const hw_module_t *module, const char *id, hw_device_t **device) int OpenDevice(const hw_module_t *module, const char *id, hw_device_t **device)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment