Revert "gs101: Enable SkiaVk as RenderEngine backend" am: 36c9c135fd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/24866271
Change-Id: I39c49cc34c10660f00bd5a83b90fd00b01cdc24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device.mk b/device.mk
index 51b735c..6db1d36 100644
--- a/device.mk
+++ b/device.mk
@@ -970,7 +970,7 @@
device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
# ARM NN files
-ARM_COMPUTE_CL_ENABLE := 1
+ARMNN_COMPUTE_CL_ENABLE := 1
# Vibrator Diag
PRODUCT_PACKAGES_DEBUG += \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2525fbf..732338c 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,21 +1,5 @@
<compatibility-matrix version="1.0" type="framework" level="6">
<hal format="hidl" optional="true">
- <name>android.hardware.radio</name>
- <version>1.2</version>
- <interface>
- <name>ISap</name>
- <instance>slot2</instance>
- </interface>
- </hal>
- <hal format="aidl" optional="true">
- <name>android.hardware.vibrator</name>
- <version>2</version>
- <interface>
- <name>IVibrator</name>
- <instance>dual</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>android.vendor.samsung_slsi.telephony.hardware.radio</name>
<version>1.1</version>
<interface>