Merge "Enable 64-bit mediadrmserver for mainline" am: 767569b489 am: 9c67ac4003

am: a9ea6d883c

Change-Id: I0d48bf4b3d529a425e30a7454a25f9adc8abaa38
This commit is contained in:
Anton Hansson 2019-01-23 02:23:04 -08:00 committed by android-build-merger
commit d596209561
2 changed files with 6 additions and 0 deletions

View File

@ -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 :=

View File

@ -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