From 9ae9209a489b65c8d10e988e7346b7521b4e9623 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Tue, 21 Sep 2021 23:29:12 +0800
Subject: [PATCH] enforce fully treble and VNDK for redroid9

---
 manifest.xml                  |  9 +++++++++
 redroid.mk                    |  7 ++++---
 redroid_arm64/BoardConfig.mk  | 23 +++++++----------------
 redroid_x86_64/BoardConfig.mk | 20 ++++++++------------
 redroid_x86_64/device.mk      |  2 +-
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 86cd85c..8a6faf2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -41,6 +41,15 @@
         <fqname>@1.1::ICryptoFactory/clearkey</fqname>
         <fqname>@1.1::IDrmFactory/clearkey</fqname>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.gatekeeper</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IGatekeeper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
diff --git a/redroid.mk b/redroid.mk
index 932096b..d2906ee 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 PRODUCT_MANUFACTURER := redroid
+PRODUCT_SHIPPING_API_LEVEL := 28
 
 PRODUCT_SOONG_NAMESPACES += external/mesa3d
 
@@ -35,9 +36,9 @@ PRODUCT_PACKAGES += \
     libEGL_swiftshader \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
+    vulkan.pastel \
     libGLES_mesa \
     vulkan.radv \
-    vulkan.pastel \
     ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -89,12 +90,12 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
-    $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
+    $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid.rc \
     $(LOCAL_PATH)/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
     $(LOCAL_PATH)/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
 
 
-$(call inherit-product, $(LOCAL_PATH)/phone-xhdpi-6144-dalvik-heap.mk)
+$(call inherit-product, device/redroid/phone-xhdpi-6144-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, product.mk)
 
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index 9cba33e..c372bef 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -1,27 +1,18 @@
-include device/generic/arm64/BoardConfig.mk
+include build/make/target/board/generic_arm64_ab/BoardConfig.mk
 
-TARGET_USES_HWC2 := true
-
-# want all fonts
-SMALLER_FONT_FOOTPRINT := false
-MINIMAL_FONT_FOOTPRINT := false
-
-BUILD_EMULATOR_OPENGL := false
-
-# use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
+# ~350M
+BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+
+# ~1.3G
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
 
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
-BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-
 BOARD_GPU_DRIVERS := virgl radeonsi
 
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
-PRODUCT_ENFORCE_VINTF_MANIFEST := true
 
-# ~ 1.3G
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index 836369a..c13bd84 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -1,22 +1,18 @@
-include device/generic/x86_64/BoardConfig.mk
+include build/make/target/board/generic_x86_64_ab/BoardConfig.mk
 
-TARGET_USES_HWC2 := true
-
-# want all fonts
-SMALLER_FONT_FOOTPRINT := false
-MINIMAL_FONT_FOOTPRINT := false
-
-# use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
+# ~350M
+BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+
+# ~1.3G
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
 
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
-BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-
 BOARD_GPU_DRIVERS := i915 i965 r300g r600g virgl iris radeonsi
 
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
-PRODUCT_ENFORCE_VINTF_MANIFEST := true
+
diff --git a/redroid_x86_64/device.mk b/redroid_x86_64/device.mk
index 9ce92c0..e967bb8 100644
--- a/redroid_x86_64/device.mk
+++ b/redroid_x86_64/device.mk
@@ -1,3 +1,3 @@
 PRODUCT_PACKAGES += \
-	vulkan.intel \
+    vulkan.intel \