Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I7a1fec0331c5bddabd4f9edabcfda9b137f7a452
diff --git a/Android.mk b/Android.mk
index de54c3a..0a022e9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,8 +20,6 @@
# to only building on ARM if they include assembly. Individual makefiles
# are responsible for having their own logic, for fine-grained control.
-LOCAL_PATH := $(call my-dir)
-
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
@@ -37,10 +35,3 @@
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml))
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-ifeq ($(USES_DEVICE_GOOGLE_GS101),true)
- include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in
index ba56441..0aa5fae 100644
--- a/conf/fstab.gs101.in
+++ b/conf/fstab.gs101.in
@@ -8,7 +8,7 @@
system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
-vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,logical,first_stage_mount
+vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable
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>
diff --git a/vibrator/Android.mk b/vibrator/Android.mk
deleted file mode 100644
index 5b089be..0000000
--- a/vibrator/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2020 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include $(call first-makefiles-under, $(call my-dir))