From d54109c53d3908fc4c066c1187fbdcc31595f57d Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Fri, 25 Jun 2021 15:40:27 +0000
Subject: [PATCH] refine product make scripts

- allow enable overlayfs data partiton
- stub to extend product definition
- auto detect GPU
---
 init.redroid.rc               | 22 ++++++++++++++++++----
 redroid.mk                    |  8 +++++---
 redroid_arm64/BoardConfig.mk  |  3 +--
 redroid_x86_64/BoardConfig.mk |  3 +--
 redroid_x86_64/device.mk      |  4 ----
 5 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 redroid_x86_64/device.mk

diff --git a/init.redroid.rc b/init.redroid.rc
index 843a7c1..b5214d1 100644
--- a/init.redroid.rc
+++ b/init.redroid.rc
@@ -1,14 +1,28 @@
 on early-init
+    mount debugfs debugfs /sys/kernel/debug mode=755
+
     mount none /system/etc /etc bind rec  # docker fix
     mount sysfs sysfs /sys rw remount  # ueventd fix
 
+    # inputflinger require this dir
+    mkdir /dev/input
+
+    exec - root root -- /vendor/bin/gpu_config.sh
+
+
+# setup overlay data partition
+on early-init && property:ro.kernel.redroid.overlay=1
+    mkdir /data-diff/upper
+    rmdir /data-diff/work
+    mkdir /data-diff/work
+
+    mount overlay overlay /data lowerdir=/data-base,upperdir=/data-diff/upper,workdir=/data-diff/work
+
+
+on init
     write /data/.empty 0
     mount none /data/.empty /proc/vmallocinfo bind # lxcfs?
 
-    # fix for WSL2
-    mkdir /dev/input
-
-    setprop gralloc.gbm.device /dev/dri/renderD128
 
 on post-fs-data
     # fix for static IP, must after post-fs-data and before netd
diff --git a/redroid.mk b/redroid.mk
index 2088902..7996d4c 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$(call inherit-product-if-exists, product.mk)
+
 PRODUCT_SOONG_NAMESPACES += external/mesa3d
 
 AUDIOSERVER_MULTILIB := first
@@ -28,7 +30,6 @@ PRODUCT_HOST_PACKAGES += \
     fs_config
 
 PRODUCT_PACKAGES += \
-    vncserver \
     hwcomposer.redroid \
     gralloc.gbm \
     gralloc.redroid \
@@ -36,7 +37,7 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
     libGLES_mesa \
-	ipconfigstore \
+    ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.kernel.qemu=1 \
@@ -89,7 +90,8 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     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:/system/etc/permissions/android.hardware.ethernet.xml \
+    frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \
+    vendor/redroid/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
 
 # Extend heap size we use for dalvik/art runtime
 $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk)
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index c42d7d1..198f80a 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -10,8 +10,7 @@ BUILD_EMULATOR_OPENGL := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-# TODO add panfrost
-BOARD_GPU_DRIVERS := freedreno lima virgl radeonsi
+BOARD_GPU_DRIVERS := virgl radeonsi
 
 DEVICE_MANIFEST_FILE := device/redroid/manifest.xml
 PRODUCT_ENFORCE_VINTF_MANIFEST := true
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index ee19ec8..3d6dba0 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -7,8 +7,7 @@ MINIMAL_FONT_FOOTPRINT := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-# i915g soong build error
-BOARD_GPU_DRIVERS := i915 i965 nouveau kmsro r300g r600g virgl vmwgfx etnaviv iris tegra radeonsi
+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
deleted file mode 100644
index 7be237f..0000000
--- a/redroid_x86_64/device.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-PRODUCT_PACKAGES += \
-    gralloc.minigbm \
-    libGLES_mesa