tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-04-28 23:56:37 +00:00 committed by Android (Google) Code Review
commit 3fec5a6498
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drm/1.0/default/Android.mk
View file

@ -41,8 +41,9 @@ LOCAL_C_INCLUDES := \
# TODO(b/18948909) Some legacy DRM plugins only support 32-bit. They need to be # TODO(b/18948909) Some legacy DRM plugins only support 32-bit. They need to be
# migrated to 64-bit. Once all of a device's legacy DRM plugins support 64-bit, # migrated to 64-bit. Once all of a device's legacy DRM plugins support 64-bit,
# that device can turn on ENABLE_MEDIADRM_64 to build this service as 64-bit. # that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as
ifneq ($(ENABLE_MEDIADRM_64), true) # 64-bit.
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_32_BIT_ONLY := true LOCAL_32_BIT_ONLY := true
endif endif
@ -80,8 +81,9 @@ LOCAL_C_INCLUDES := \
# TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to # TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to
# 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit, # 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit,
# that device can turn on ENABLE_MEDIADRM_64 to build this impl as 64-bit. # that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this impl as
ifneq ($(ENABLE_MEDIADRM_64), true) # 64-bit.
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_32_BIT_ONLY := true LOCAL_32_BIT_ONLY := true
endif endif