Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev

Browse Source 
am: 3fec5a6498

Change-Id: I9a92b21accd342f3781c9198de40515d556db930
This commit is contained in:
John W. Bruce
2017-04-29 00:00:12 +00:00
committed by android-build-merger
parent e179f58268 3fec5a6498
commit 3b361d8548
1 changed files with 6 additions and 4 deletions
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
# 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.
ifneq ($(ENABLE_MEDIADRM_64), true)
# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as
# 64-bit.
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_32_BIT_ONLY := true
endif
@@ -80,8 +81,9 @@ LOCAL_C_INCLUDES := \
# 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,
# that device can turn on ENABLE_MEDIADRM_64 to build this impl as 64-bit.
ifneq ($(ENABLE_MEDIADRM_64), true)
# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this impl as
# 64-bit.
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_32_BIT_ONLY := true
endif