From 0ad810849bf35f51ebbc9c45fdfe20acce4fcc07 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Mon, 15 May 2023 15:38:58 +0800 Subject: [PATCH] Support dynamic 64-bit drmserver 64-bit GSI requires support both 64_32-bit and 64-bit devices at the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER to put drmserver_dynamic.rc into GSI. Which starts 64-bit drmserver if ro.zygote is zygote64. Otherwise, it keeps the original behavior to start 32-bit drmserver. Bug: 282603373 Test: make gsi_arm64-user; Check system/etc/init Test: make gsi_arm-user; Check systen/etc/init Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0 Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0 --- core/android_soong_config_vars.mk | 1 + target/board/generic_arm64/BoardConfig.mk | 2 ++ target/board/generic_x86_64/BoardConfig.mk | 2 ++ target/board/gsi_arm64/BoardConfig.mk | 2 ++ 4 files changed, 7 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index f2ff201ab5..995eefb875 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -27,6 +27,7 @@ $(call add_soong_config_namespace,ANDROID) # Add variables to the namespace below: $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) +$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,IS_TARGET_MIXED_SEPOLICY) ifeq ($(IS_TARGET_MIXED_SEPOLICY),true) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 40be80e413..e2d5fb4df8 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -54,6 +54,8 @@ endif # Include 64-bit mediaserver to support 64-bit only devices TARGET_DYNAMIC_64_32_MEDIASERVER := true +# Include 64-bit drmserver to support 64-bit only devices +TARGET_DYNAMIC_64_32_DRMSERVER := true include build/make/target/board/BoardConfigGsiCommon.mk diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index e7f2ae0072..36136f4b35 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -24,6 +24,8 @@ TARGET_2ND_ARCH_VARIANT := x86_64 # Include 64-bit mediaserver to support 64-bit only devices TARGET_DYNAMIC_64_32_MEDIASERVER := true +# Include 64-bit drmserver to support 64-bit only devices +TARGET_DYNAMIC_64_32_DRMSERVER := true include build/make/target/board/BoardConfigGsiCommon.mk diff --git a/target/board/gsi_arm64/BoardConfig.mk b/target/board/gsi_arm64/BoardConfig.mk index db95082e5f..7910b1da15 100644 --- a/target/board/gsi_arm64/BoardConfig.mk +++ b/target/board/gsi_arm64/BoardConfig.mk @@ -29,6 +29,8 @@ TARGET_2ND_CPU_VARIANT := generic # Include 64-bit mediaserver to support 64-bit only devices TARGET_DYNAMIC_64_32_MEDIASERVER := true +# Include 64-bit drmserver to support 64-bit only devices +TARGET_DYNAMIC_64_32_DRMSERVER := true # TODO(b/111434759, b/111287060) SoC specific hacks BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp