From 467c0db62c648da651a41c000381055b1703c5dc Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Thu, 27 Apr 2017 12:06:29 -0700 Subject: [PATCH] Prefix ENABLE_MEDIADRM_64 with TARGET_ This build-time flag should be prefixed. Bug: 37039525 Test: Built OS Change-Id: If6f6cd1ad2df5f000a4264cabeb7d9eb77e194ea --- drm/1.0/default/Android.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk index 7602399842..4c05da8929 100644 --- a/drm/1.0/default/Android.mk +++ b/drm/1.0/default/Android.mk @@ -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