Merge "Support dynamic 64-bit media service"
This commit is contained in:
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user