Revert "disable simulated bluetooth"

This reverts commit 8a01a9f162.
move pid_max setting to redroid.common.rc
2023-12-01 22:34:49 +08:00 · 2023-12-01 22:33:36 +08:00 · 2023-09-07 19:21:24 +08:00 · 2023-08-29 18:34:07 +08:00 · 2023-03-31 10:13:16 +08:00 · 2022-10-27 20:17:30 +08:00
14 changed files with 37 additions and 30 deletions
--- a/init.redroid32.rc
+++ b/init.redroid32.rc
@@ -1,3 +0,0 @@
-on early-init
-    write /proc/sys/kernel/pid_max 65535
-
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="6">
+<manifest version="1.0" type="device" target-level="7">
    <hal format="hidl">
        <name>android.hardware.audio</name>
        <transport>hwbinder</transport>
@@ -44,13 +44,4 @@
            <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
@@ -41,7 +41,7 @@ else
 PRODUCT_BUILD_SYSTEM_IMAGE := true
 endif

-PRODUCT_SHIPPING_API_LEVEL := 31
+PRODUCT_SHIPPING_API_LEVEL := 33

 AUDIOSERVER_MULTILIB := first

@@ -79,20 +79,18 @@ 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@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.health-service.example \
+    android.hardware.keymaster@4.1-service \
    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)
-else
-$(call inherit-product, hardware/redroid/c2/c2.mk)
 endif

+$(call inherit-product, hardware/redroid/c2/c2.mk)
+

 DEVICE_MANIFEST_FILE += device/redroid/android.hardware.bluetooth@1.1.xml

--- a/redroid.prop
+++ b/redroid.prop
@@ -1,4 +1,3 @@
-ro.kernel.qemu=1
 ro.hardware=redroid

 # disable ueventd cold-boot for performance
--- a/redroid_64only.mk
+++ b/redroid_64only.mk
@@ -0,0 +1 @@
+TARGET_VENDOR_PROP += device/redroid/redroid_64only.prop
--- a/redroid_64only.prop
+++ b/redroid_64only.prop
@@ -0,0 +1 @@
+ro.boot.use_redroid_c2=1
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -25,7 +25,3 @@ PRODUCT_BRAND := redroid
 PRODUCT_MODEL := redroid13_arm64

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/init.redroid32.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.redroid32.rc \
-
--- a/redroid_arm64_only.mk
+++ b/redroid_arm64_only.mk
@@ -15,6 +15,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)

+$(call inherit-product, $(LOCAL_PATH)/redroid_64only.mk)
 REDROID_DISABLE_OMX := true
 $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 $(call inherit-product, $(LOCAL_PATH)/redroid_arm64_only/device.mk)
--- a/redroid_x86_64.mk
+++ b/redroid_x86_64.mk
@@ -24,7 +24,3 @@ PRODUCT_BRAND := redroid
 PRODUCT_MODEL := redroid13_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 \
-
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -8,6 +8,16 @@ TARGET_2ND_ARCH_VARIANT := x86_64

 include build/make/target/board/BoardConfigGsiCommon.mk

+TARGET_NATIVE_BRIDGE_ARCH := arm64
+TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv8-a
+TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic
+TARGET_NATIVE_BRIDGE_ABI := arm64-v8a
+
+TARGET_NATIVE_BRIDGE_2ND_ARCH := arm
+TARGET_NATIVE_BRIDGE_2ND_ARCH_VARIANT := armv7-a-neon
+TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT := generic
+TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi
+
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
--- a/redroid_x86_64/device.mk
+++ b/redroid_x86_64/device.mk
@@ -1,4 +1,10 @@
 PRODUCT_COPY_FILES += \
    device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \

+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.enable.native.bridge.exec=1 \
+    ro.dalvik.vm.isa.arm64=x86_64 \
+    ro.dalvik.vm.isa.arm=x86 \
+    ro.dalvik.vm.native.bridge=libnb.so \
+
 $(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)
--- a/redroid_x86_64_only.mk
+++ b/redroid_x86_64_only.mk
@@ -15,6 +15,7 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)

+$(call inherit-product, $(LOCAL_PATH)/redroid_64only.mk)
 REDROID_DISABLE_OMX := true
 $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64_only/device.mk)
--- a/redroid_x86_64_only/BoardConfig.mk
+++ b/redroid_x86_64_only/BoardConfig.mk
@@ -4,6 +4,11 @@ TARGET_ARCH_VARIANT := x86_64

 include build/make/target/board/BoardConfigGsiCommon.mk

+TARGET_NATIVE_BRIDGE_ARCH := arm64
+TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv8-a
+TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic
+TARGET_NATIVE_BRIDGE_ABI := arm64-v8a
+
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
--- a/redroid_x86_64_only/device.mk
+++ b/redroid_x86_64_only/device.mk
@@ -1,4 +1,9 @@
 PRODUCT_COPY_FILES += \
    device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \

+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.enable.native.bridge.exec=1 \
+    ro.dalvik.vm.isa.arm64=x86_64 \
+    ro.dalvik.vm.native.bridge=libnb.so \
+
 $(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)
Author	SHA1	Message	Date
Ziyang Zhou	736f66d854	Revert "disable simulated bluetooth" This reverts commit `8a01a9f162`.	2023-12-01 22:34:49 +08:00
Ziyang Zhou	1e4496cede	move pid_max setting to redroid.common.rc	2023-12-01 22:33:36 +08:00
Ziyang Zhou	b81806e883	update manifest target-level to 7 several hals get updated - health - keymaster - thermal	2023-09-07 19:21:24 +08:00
Ziyang Zhou	8a01a9f162	disable simulated bluetooth	2023-08-29 18:34:07 +08:00
Ziyang Zhou	3b59c7498a	add native bridge support for x86_64	2023-03-31 10:13:16 +08:00
Ziyang Zhou	ef44f26de8	remove qemu=1 prop, should use androidboot.xxx	2022-10-27 20:17:30 +08:00
Ziyang Zhou	46472e397c	fix 64only build	2022-08-22 20:29:23 +08:00
Ziyang Zhou	45721b6f00	refine 64only makefile; enable c2 for 64only builds	2022-08-22 09:03:47 +08:00
Ziyang Zhou	7e9daa196f	refine Android 13 build	2022-08-16 18:12:13 +08:00
				`@@ -0,0 +1 @@`
				`TARGET_VENDOR_PROP += device/redroid/redroid_64only.prop`