Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fec5a64 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev

parents 9f5b6aaf 467c0db6

drm/1.0/default/Android.mk

+6 −4
Original line number Diff line number Diff line
@@ -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