From e769af33359914bc183c57242ccde9f3d82afa16 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Thu, 24 Jun 2021 15:29:04 +0000
Subject: [PATCH] refine product make scripts

- allow enable overlayfs data partiton
- stub to extend product definition
- auto detect GPU
---
 init.redroid.rc               | 23 ++++++++++++++++++-----
 redroid.mk                    | 18 +++++++++++-------
 redroid_arm64/BoardConfig.mk  |  2 +-
 redroid_x86_64/BoardConfig.mk |  2 +-
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/init.redroid.rc b/init.redroid.rc
index 3d48e35..ee50e3a 100644
--- a/init.redroid.rc
+++ b/init.redroid.rc
@@ -1,10 +1,9 @@
 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
 
-    write /data/.empty 0
-    mount none /data/.empty /proc/vmallocinfo bind # lxcfs?
-
     symlink /system/bin /bin
 
     # Mount binderfs
@@ -20,16 +19,30 @@ on early-init
     chmod 0666 /dev/binderfs/binder
     chmod 0666 /dev/binderfs/vndbinder
 
-    # fix for WSL2
+    # inputflinger require this dir
     mkdir /dev/input
 
-    setprop gralloc.gbm.device /dev/dri/renderD128
+    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?
+
     # use updated swiftshader, disable gpu pixel buffer first
     # reenable if use mesa
     setprop debug.hwui.use_gpu_pixel_buffers false
 
+
 on post-fs-data
     # fix for static IP, must after post-fs-data and before netd
     exec - system system -- /vendor/bin/ipconfigstore v2
diff --git a/redroid.mk b/redroid.mk
index adc5f67..659c6ad 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)
+
 AUDIOSERVER_MULTILIB := first
 
 # ?
@@ -26,16 +28,16 @@ PRODUCT_PACKAGES += \
     fs_config
 
 PRODUCT_PACKAGES += \
-    vncserver \
+    audio.r_submix.default \
     hwcomposer.redroid \
-	gralloc.gbm \
+    gralloc.gbm \
     gralloc.redroid \
     gatekeeper.ranchu \
     libEGL_swiftshader \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
-	libGLES_mesa \
-	ipconfigstore \
+    libGLES_mesa \
+    ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.kernel.qemu=1 \
@@ -81,10 +83,12 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
-	frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \
-    device/generic/goldfish/audio_policy.conf:system/etc/audio_policy.conf
+    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
+    frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \
+    device/generic/goldfish/audio_policy.conf:system/etc/audio_policy.conf \
+    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 dc16c38..0c8301c 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -9,7 +9,7 @@ MINIMAL_FONT_FOOTPRINT := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-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 5404ed1..bb26133 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -9,7 +9,7 @@ MINIMAL_FONT_FOOTPRINT := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-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