From ac952ee4d7f047946bc3c75991b36d84ed97461f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 9 Jan 2019 16:12:38 +0000 Subject: [PATCH] Enable 64-bit mediadrmserver for mainline This flag turns on 64-bit mediadrmserver for mainline. Keep the default value for GSI for now. Bug: 80410283 Test: make Change-Id: Ie09b258f140b56121e4b531775b2a052b4dc6c15 --- target/board/BoardConfigGsiCommon.mk | 3 +++ target/board/BoardConfigMainlineCommon.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index a853b3c69..825c7d707 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -56,3 +56,6 @@ BOARD_USES_METADATA_PARTITION := true # The partition size doesn't matter, just to make build pass. BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216 + +# Disable 64 bit mediadrmserver +TARGET_ENABLE_MEDIADRM_64 := diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index ec3c74f81..2e2e01018 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -17,6 +17,9 @@ BOARD_VNDK_VERSION := current # Required flag for non-64 bit devices from P. TARGET_USES_64_BIT_BINDER := true +# 64 bit mediadrmserver +TARGET_ENABLE_MEDIADRM_64 := true + # Puts odex files on system_other, as well as causing dex files not to get # stripped from APKs. BOARD_USES_SYSTEM_OTHER_ODEX := true