commit 767569b489d5d2da04d40ae59bc9bac49a32aa2c
author Anton Hansson <hansson@google.com> Wed Jan 23 09:56:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 23 09:56:46 2019 +0000
tree 864994b5319d9c6369b372150c030cc00f6af2a1
parent 9779c57cd0ab8e6df9ef97a5b7e685c7ede38aa5
parent ac952ee4d7f047946bc3c75991b36d84ed97461f

Merge "Enable 64-bit mediadrmserver for mainline"

target/board/BoardConfigGsiCommon.mk

diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index 05ce35f..1037eec 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -58,3 +58,6 @@
 # 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 :=

target/board/BoardConfigMainlineCommon.mk

diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk
index 46e5d93..9a4fb3a 100644
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -21,6 +21,9 @@
 # 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