move pid_max setting to redroid.common.rc

add native bridge support for x86_64
remove qemu=1 prop, should use androidboot.xxx
2023-12-01 22:32:14 +08:00 · 2023-03-31 10:12:30 +08:00 · 2022-10-27 20:16:53 +08:00 · 2022-08-22 20:29:47 +08:00 · 2022-08-22 09:05:22 +08:00 · 2022-07-27 17:56:19 +08:00
7 changed files with 26 additions and 20 deletions
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -21,8 +21,8 @@ PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/redroid_arm64_only.mk \

 COMMON_LUNCH_CHOICES := \
-    redroid_x86_64-trunk_staging-userdebug \
-    redroid_x86_64_only-trunk_staging-userdebug \
-    redroid_arm64-trunk_staging-userdebug \
-    redroid_arm64_only-trunk_staging-userdebug \
+    redroid_x86_64-userdebug \
+    redroid_x86_64_only-userdebug \
+    redroid_arm64-userdebug \
+    redroid_arm64_only-userdebug \

--- a/manifest.xml
+++ b/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>
--- a/redroid.mk
+++ b/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.keymaster@4.1-service \
+    android.hardware.health@2.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)

--- a/redroid_arm64.mk
+++ b/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 := redroid14_arm64
+PRODUCT_MODEL := redroid12_arm64

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
--- a/redroid_arm64_only.mk
+++ b/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 := redroid14_arm64_only
+PRODUCT_MODEL := redroid12_arm64_only

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay

--- a/redroid_x86_64.mk
+++ b/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 := redroid14_x86_64
+PRODUCT_MODEL := redroid12_x86_64

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
--- a/redroid_x86_64_only.mk
+++ b/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 := redroid14_x86_64_only
+PRODUCT_MODEL := redroid12_x86_64_only

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
Author	SHA1	Message	Date
Ziyang Zhou	f4f6409f7f	move pid_max setting to redroid.common.rc	2023-12-01 22:32:14 +08:00
Ziyang Zhou	a9f993a02c	add native bridge support for x86_64	2023-03-31 10:12:30 +08:00
Ziyang Zhou	a430feff57	remove qemu=1 prop, should use androidboot.xxx	2022-10-27 20:16:53 +08:00
Ziyang Zhou	2183f56dea	fix 64only build	2022-08-22 20:29:47 +08:00
Ziyang Zhou	5255a7caa7	refine 64only makefile; enable c2 for 64only builds	2022-08-22 09:05:22 +08:00
Ziyang Zhou	ad39787c7f	fix remote-android/redroid-doc#200 add simulated Bluetooth	2022-07-27 17:56:19 +08:00
Ziyang Zhou	6929d5cd83	move props to seperate file	2022-07-07 19:51:11 +08:00
Ziyang Zhou	90bb8a1051	move common config to /vendor/redroid	2022-07-07 19:51:11 +08:00
Ziyang Zhou	0f08c99d11	add redroid codecs (OMX & C2)	2022-07-06 21:05:13 +08:00
Ziyang Zhou	caabed5eab	claim more system features; bluetooth NOT ready	2022-07-06 19:59:59 +08:00
Ziyang Zhou	d5505b34c8	refine mediacodec policy	2022-05-14 00:51:40 +08:00
Ziyang Zhou	d4f0c1879d	change to use prebuilts	2022-05-14 00:50:52 +08:00