move pid_max setting to redroid.common.rc

AndroidProducts.mk

@@ -21,8 +21,8 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/redroid_arm64_only.mk \
 
 COMMON_LUNCH_CHOICES := \
-    redroid_x86_64-bp2a-userdebug \
+    redroid_x86_64-userdebug \
-    redroid_x86_64_only-bp2a-userdebug \
+    redroid_x86_64_only-userdebug \
-    redroid_arm64-bp2a-userdebug \
+    redroid_arm64-userdebug \
-    redroid_arm64_only-bp2a-userdebug \
+    redroid_arm64_only-userdebug \
 

manifest.xml

@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="7">
+<manifest version="1.0" type="device" target-level="6">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -44,4 +44,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>3.0</version>
+        <interface>
+            <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>

redroid.mk

@@ -16,8 +16,6 @@ PRODUCT_MANUFACTURER := redroid
 
 #$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 #PRODUCT_COMPRESSED_APEX := false
-OVERRIDE_TARGET_FLATTEN_APEX := true
-OVERRIDE_PRODUCT_COMPRESSED_APEX := false
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
@@ -43,7 +41,7 @@ else
 PRODUCT_BUILD_SYSTEM_IMAGE := true
 endif
 
-PRODUCT_SHIPPING_API_LEVEL := 34
+PRODUCT_SHIPPING_API_LEVEL := 31
 
 AUDIOSERVER_MULTILIB := first
 
@@ -81,17 +79,19 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@2.0-impl-2.1 \
     android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.composer@2.1-impl \
-    android.hardware.health-service.example \
+    android.hardware.health@2.1-service \
-    android.hardware.keymaster@4.1-service \
+    android.hardware.health@2.1-impl \
+    android.hardware.keymaster@3.0-service \
+    android.hardware.keymaster@3.0-impl \
+    power.default \
     android.hardware.power-service.example \
-    android.hardware.thermal@2.0-service.mock \
 
 
 ifneq ($(REDROID_DISABLE_OMX),true)
 $(call inherit-product, hardware/redroid/omx/omx.mk)
-endif
+else
-
 $(call inherit-product, hardware/redroid/c2/c2.mk)
+endif
 
 
 DEVICE_MANIFEST_FILE += device/redroid/android.hardware.bluetooth@1.1.xml
@@ -121,9 +121,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/redroid-removed-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/redroid-removed-permissions.xml \
     $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid.rc \
 
-# required by Settings
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 

redroid_arm64.mk

@@ -22,6 +22,6 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
 PRODUCT_NAME := redroid_arm64
 PRODUCT_DEVICE := redroid_arm64
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid16_arm64
+PRODUCT_MODEL := redroid12_arm64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay

redroid_arm64_only.mk

@@ -24,7 +24,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_arm64_only/device.mk)
 PRODUCT_NAME := redroid_arm64_only
 PRODUCT_DEVICE := redroid_arm64_only
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid16_arm64_only
+PRODUCT_MODEL := redroid12_arm64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 

redroid_x86_64.mk

@@ -21,6 +21,6 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64/device.mk)
 PRODUCT_NAME := redroid_x86_64
 PRODUCT_DEVICE := redroid_x86_64
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid16_x86_64
+PRODUCT_MODEL := redroid12_x86_64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay

redroid_x86_64_only.mk

@@ -23,7 +23,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64_only/device.mk)
 PRODUCT_NAME := redroid_x86_64_only
 PRODUCT_DEVICE := redroid_x86_64_only
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid16_x86_64_only
+PRODUCT_MODEL := redroid12_x86_64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay