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
6 changed files with 11 additions and 22 deletions
--- 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_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 := redroid12_arm64
+PRODUCT_MODEL := redroid13_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 := redroid12_arm64_only
+PRODUCT_MODEL := redroid13_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 := redroid12_x86_64
+PRODUCT_MODEL := redroid13_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 := redroid12_x86_64_only
+PRODUCT_MODEL := redroid13_x86_64_only

 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
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
Ziyang Zhou	9b0fe4386f	fix remote-android/redroid-doc#200 add simulated Bluetooth	2022-07-27 17:56:48 +08:00
Ziyang Zhou	63eac7fb21	move props to seperate file	2022-07-07 11:00:50 +08:00
Ziyang Zhou	14829bea6e	move common config to /vendor/redroid	2022-07-07 11:00:50 +08:00
Ziyang Zhou	e308903446	add redroid codecs (OMX & C2)	2022-07-07 10:43:38 +08:00
Ziyang Zhou	f6cdd8ea29	claim more system features; bluetooth NOT ready	2022-07-07 10:43:38 +08:00
Ziyang Zhou	f162fed7bf	refine mediacodec policy	2022-05-14 00:48:52 +08:00
Ziyang Zhou	a8642ab4d2	change to use prebuilts	2022-05-14 00:47:48 +08:00
Ziyang Zhou	52d7280bcb	add android-t-preview-1 support	2022-02-21 00:58:01 +08:00