commit 3fec5a6498e7291fbea7b6eb0d442d95d46fbe1f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 28 23:56:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 28 23:56:38 2017 +0000
tree 6fe72b54bb90e32184fc2af15f2b790ce411fa38
parent 9f5b6aaf73ce88f8ca751fcb236b9a9e8f220d78
parent 467c0db62c648da651a41c000381055b1703c5dc

Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev

drm/1.0/default/Android.mk

diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk
index 7602399..4c05da8 100644
--- a/drm/1.0/default/Android.mk
+++ b/drm/1.0/default/Android.mk
@@ -41,8 +41,9 @@
 
 # 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 @@
 
 # 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