feat: add vendor_gapps

This reverts commit 8a01a9f162.

AndroidProducts.mk

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

init.redroid32.rc

@@ -1,3 +0,0 @@
-on early-init
-    write /proc/sys/kernel/pid_max 65535
-

redroid-removed-permissions.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
-    <unavailable-feature name="android.hardware.bluetooth" />
 </permissions>

redroid.mk

@@ -16,6 +16,8 @@ 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)
 
@@ -41,7 +43,7 @@ else
 PRODUCT_BUILD_SYSTEM_IMAGE := true
 endif
 
-PRODUCT_SHIPPING_API_LEVEL := 33
+PRODUCT_SHIPPING_API_LEVEL := 34
 
 AUDIOSERVER_MULTILIB := first
 
@@ -92,6 +94,11 @@ endif
 $(call inherit-product, hardware/redroid/c2/c2.mk)
 
 
+DEVICE_MANIFEST_FILE += device/redroid/android.hardware.bluetooth@1.1.xml
+
+PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.sim
+
+
 PRODUCT_SOONG_NAMESPACES += frameworks/av/services/audiopolicy/config
 # audio policy
 PRODUCT_PACKAGES += \
@@ -114,6 +121,9 @@ 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,10 +22,6 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
 PRODUCT_NAME := redroid_arm64
 PRODUCT_DEVICE := redroid_arm64
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid13_arm64
+PRODUCT_MODEL := redroid15_arm64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/init.redroid32.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid32.rc \
-

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 := redroid13_arm64_only
+PRODUCT_MODEL := redroid15_arm64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 

redroid_arm64_only/device.mk

@@ -2,3 +2,4 @@ PRODUCT_COPY_FILES += \
     device/redroid/mediacodec.policy.arm:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
 
 $(call inherit-product, device/redroid-prebuilts/prebuilts_arm.mk)
+$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)

redroid_x86_64.mk

@@ -21,10 +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 := redroid13_x86_64
+PRODUCT_MODEL := redroid15_x86_64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/init.redroid32.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid32.rc \
-

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 := redroid13_x86_64_only
+PRODUCT_MODEL := redroid15_x86_64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay