commit f3a591cc9d604133e2c5cae3d34322b52cd7575d
author Jeff Tinker <jtinker@google.com> Wed Feb 01 15:42:13 2017 -0800
committer Jeff Tinker <jtinker@google.com> Wed Feb 01 18:19:05 2017 -0800
tree 6401761aab8416a91c0a022558cde7fcbc98022c
parent 70537c1ce74eff5cbd6554fc972a7d44b7157eca

Enable DRM HIDL HAL by default

Eliminate ENABLE_TREBLE since it is obsolete.
Switching back to legacy DRM is still possible
by building with DISABLE_TREBLE_DRM=true

Change-Id: I6b921050dff6162112c60df21549fc93bc46e379

services/mediadrm/Android.mk

diff --git a/services/mediadrm/Android.mk b/services/mediadrm/Android.mk
index 2bf2201..e72236d 100644
--- a/services/mediadrm/Android.mk
+++ b/services/mediadrm/Android.mk
@@ -25,7 +25,7 @@
     liblog \
     libmediadrm \
     libutils
-ifeq ($(ENABLE_TREBLE), true)
+ifneq ($(DISABLE_TREBLE_DRM), true)
 LOCAL_SHARED_LIBRARIES += \
     libhidlbase \
     libhidlmemory \
@@ -34,8 +34,8 @@
 endif
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror
-ifeq ($(ENABLE_TREBLE), true)
-LOCAL_CFLAGS += -DENABLE_TREBLE=1
+ifeq ($(DISABLE_TREBLE_DRM), true)
+LOCAL_CFLAGS += -DDISABLE_TREBLE_DRM=1
 endif
 
 LOCAL_MODULE:= mediadrmserver