From 62c070778d5bd7561cbef6f16de80407c4fa14c7 Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Tue, 3 Aug 2021 05:02:50 +0000 Subject: [PATCH] refine product makefile --- redroid.mk | 1 + redroid_arm64.mk | 7 ++----- redroid_x86_64.mk | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/redroid.mk b/redroid.mk index 50f5124..12bac4f 100644 --- a/redroid.mk +++ b/redroid.mk @@ -95,6 +95,7 @@ PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \ frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \ + $(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..bbfbe0e 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 := redroid10_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..218c807 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 := redroid10_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