diff options
| author | 2019-01-23 09:56:46 +0000 | |
|---|---|---|
| committer | 2019-01-23 09:56:46 +0000 | |
| commit | 767569b489d5d2da04d40ae59bc9bac49a32aa2c (patch) | |
| tree | 864994b5319d9c6369b372150c030cc00f6af2a1 | |
| parent | 9779c57cd0ab8e6df9ef97a5b7e685c7ede38aa5 (diff) | |
| parent | ac952ee4d7f047946bc3c75991b36d84ed97461f (diff) | |
Merge "Enable 64-bit mediadrmserver for mainline"
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 3 | ||||
| -rw-r--r-- | target/board/BoardConfigMainlineCommon.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 05ce35fb59..1037eec7cd 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -58,3 +58,6 @@ endif # 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 46e5d93032..9a4fb3a636 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -21,6 +21,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 |