From a9f993a02cb34825e91c47635ddf5f4438ba8aad Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Thu, 30 Mar 2023 20:38:32 +0800 Subject: [PATCH] add native bridge support for x86_64 --- redroid_x86_64/BoardConfig.mk | 10 ++++++++++ redroid_x86_64/device.mk | 6 ++++++ redroid_x86_64_only/BoardConfig.mk | 5 +++++ redroid_x86_64_only/device.mk | 5 +++++ 4 files changed, 26 insertions(+) diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk index ca1ae39..d6fc67c 100755 --- 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 diff --git a/redroid_x86_64/device.mk b/redroid_x86_64/device.mk index 4eb8dca..d2bf9bc 100644 --- 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) diff --git a/redroid_x86_64_only/BoardConfig.mk b/redroid_x86_64_only/BoardConfig.mk index 324e488..fa6252d 100755 --- 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 diff --git a/redroid_x86_64_only/device.mk b/redroid_x86_64_only/device.mk index 4eb8dca..a9a70f0 100644 --- 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)