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

Commit cd3752d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support dynamic 64-bit drmserver" into udc-dev

parents 593b2e5c 0dce3480

core/android_soong_config_vars.mk

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

target/board/generic_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

target/board/generic_x86_64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

target/board/gsi_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -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