g12-common: Put oemlock support behind TEE flag

Makes no sense to ship on devkits.

Change-Id: Ic439ec47080e842039a242087715538810ed979c

diff --git a/g12.mk b/g12.mk
index f1f6f1726430bfabbbc9a0e6d984480ff2109268..740b2fa2f2adfac0d7cb46f3aa06cf3a6906250a 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -125,8 +125,13 @@ PRODUCT_PACKAGES += \
 endif
 
 ## OEM Lock
+ifneq ($(TARGET_HAS_TEE),false)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.oem_unlock_supported=1
+
 PRODUCT_PACKAGES += \
     android.hardware.oemlock@1.0.vendor
+endif
 
 ## Partitions
 PRODUCT_USE_DYNAMIC_PARTITIONS := true

diff --git a/proprietary-files-tee.txt b/proprietary-files-tee.txt
index f5d7017b513f0ed8c039e4d3592c9f6df45ae237..260478f71c1a62222662286ac2ea451642d4bb32 100644 (file)
--- a/proprietary-files-tee.txt
+++ b/proprietary-files-tee.txt
@@ -1,6 +1,11 @@
 ## All blobs from this list, unless pinned and noted as otherwise,
 ## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
 
+## OEM Lock
+vendor/bin/hw/android.hardware.oemlock@1.0-service.droidlogic
+vendor/etc/init/android.hardware.oemlock@1.0-service.droidlogic.rc
+vendor/etc/vintf/manifest/android.hardware.oemlock@1.0-service.droidlogic.xml
+
 ## TEE/Keymaster
 vendor/bin/hw/android.hardware.security.keymint-service.amlogic
 vendor/bin/tee-supplicant

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 303da163aa99ebcbcb2fdfe0e00dc71d53180d08..b8907cbcd168574f0c924c1418e387afaca52aea 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -153,11 +153,6 @@ vendor/lib/libmediahal_videodec.so
 # Memtrack
 vendor/lib/hw/memtrack.amlogic.so
 
-# OEM Lock
-vendor/bin/hw/android.hardware.oemlock@1.0-service.droidlogic
-vendor/etc/init/android.hardware.oemlock@1.0-service.droidlogic.rc
-vendor/etc/vintf/manifest/android.hardware.oemlock@1.0-service.droidlogic.xml
-
 # OMX
 odm/lib/libHwAudio_dcvdec.so
 odm/lib/libHwAudio_dtshd.so

diff --git a/vendor.prop b/vendor.prop
index 4caad75be41fda6370a10cf19aa259cca189bf4d..4c0c9eba7ce0063c70542033ff327b76c1bfb39e 100644 (file)
--- a/vendor.prop
+++ b/vendor.prop
@@ -44,8 +44,5 @@ vendor.media.omx.out_buffer2_osd=8
 vendor.media.omx.display_mode=3
 vendor.media.sf.omxvideo-optmize=1
 
-## OEM Lock
-ro.oem_unlock_supported=1
-
 ## USB
 vendor.usb.controller=ff400000.dwc2_a