From 971ddb37b3e69f0b8c3620279a2dfda081603c47 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Tue, 3 Aug 2021 05:02:50 +0000
Subject: [PATCH] refine product makefile

---
 init.redroid.rc   | 2 +-
 redroid.mk        | 1 +
 redroid_arm64.mk  | 7 ++-----
 redroid_x86_64.mk | 7 ++-----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/init.redroid.rc b/init.redroid.rc
index 8aa41b2..3222e74 100644
--- a/init.redroid.rc
+++ b/init.redroid.rc
@@ -17,7 +17,7 @@ on early-init
     chmod 0666 /dev/binderfs/binder
     chmod 0666 /dev/binderfs/vndbinder
 
-    # fix for WSL2
+    # inputflinger require this dir
     mkdir /dev/input
 
     exec - root root -- /vendor/bin/gpu_config.sh
diff --git a/redroid.mk b/redroid.mk
index 24775ce..ff2dab0 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -87,6 +87,7 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libeffects/data/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/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:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
+    $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
     vendor/redroid/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
 
 
diff --git a/redroid_arm64.mk b/redroid_arm64.mk
index cedd888..240fdb4 100644
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -21,10 +21,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 PRODUCT_NAME := redroid_arm64
 PRODUCT_DEVICE := redroid_arm64
 PRODUCT_BRAND := ReDroid
-PRODUCT_MODEL := ReDroid
+PRODUCT_MODEL := redroid9_arm64
 
-PRODUCT_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
diff --git a/redroid_x86_64.mk b/redroid_x86_64.mk
index aca6751..99509a8 100644
--- a/redroid_x86_64.mk
+++ b/redroid_x86_64.mk
@@ -20,10 +20,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 PRODUCT_NAME := redroid_x86_64
 PRODUCT_DEVICE := redroid_x86_64
 PRODUCT_BRAND := ReDroid
-PRODUCT_MODEL := ReDroid
+PRODUCT_MODEL := redroid9_x86_64
 
-PRODUCT_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay