Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95127949 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Support dynamic 64-bit media service 

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_MEDIASERVER
to put mediaserver_dynamic.rc into GSI. Which starts 64-bit
mediaserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit meidaserver.

Bug: 236664614
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Test: cts-tradefed; run cts-on-gsi -m CtsViewTestCases
Change-Id: I74699ec5fafadcbe78a7fef6d10aaed752cd5afa
parent b4f831d5

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,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_ENABLE_MEDIADRM_64)

$(call add_soong_config_var,ANDROID,IS_TARGET_MIXED_SEPOLICY)

ifeq ($(IS_TARGET_MIXED_SEPOLICY),true)

target/board/generic_arm64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ TARGET_2ND_ARCH_VARIANT := armv8-a 
TARGET_2ND_CPU_VARIANT := generic

endif



# Include 64-bit mediaserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_MEDIASERVER := true



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



# Some vendors still haven't cleaned up all device specific directories under

target/board/generic_x86_64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ TARGET_2ND_CPU_ABI := x86 
TARGET_2ND_ARCH := x86

TARGET_2ND_ARCH_VARIANT := x86_64



# Include 64-bit mediaserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_MEDIASERVER := true



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



ifndef BUILDING_GSI

target/board/gsi_arm64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ TARGET_2ND_CPU_ABI := armeabi-v7a 
TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic



# Include 64-bit mediaserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_MEDIASERVER := true



# TODO(b/111434759, b/111287060) SoC specific hacks

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp

BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist