commit a07af8aea7f5d944a7ad1dcc81b9c9bcb829eead
author Jeff Tinker <jtinker@google.com> Mon Apr 24 15:20:53 2017 -0700
committer Colin Cross <ccross@android.com> Sat Apr 29 00:14:15 2017 +0000
tree 5c118bd474f3818e8833deae33c6837fb18ec214
parent 51354f8282d6828c6a3f43d9ab4a00d3d87615df

Remove DISABLE_TREBLE_DRM

This flag is obsolete now that the conversion
to treble is complete.

Change-Id: I7073d337939da43bddf99644bfe52db9baa2f605
Merged-In: I7073d337939da43bddf99644bfe52db9baa2f605
related-to-bug: 32815560
(cherry picked from commit 99a5aba027cca8d3e69e333b56168a223e053d82)

drm/libmediadrm/Android.mk

diff --git a/drm/libmediadrm/Android.mk b/drm/libmediadrm/Android.mk
index 5b56501..14d5cab 100644
--- a/drm/libmediadrm/Android.mk
+++ b/drm/libmediadrm/Android.mk
@@ -25,16 +25,9 @@
     IDrmClient.cpp \
     IMediaDrmService.cpp \
     MediaCasDefs.cpp \
-    SharedLibrary.cpp
-ifneq ($(DISABLE_TREBLE_DRM), true)
-LOCAL_SRC_FILES += \
+    SharedLibrary.cpp \
     DrmHal.cpp \
     CryptoHal.cpp
-else
-LOCAL_SRC_FILES += \
-    Drm.cpp \
-    Crypto.cpp
-endif
 
 LOCAL_SHARED_LIBRARIES := \
     libbinder \
@@ -43,15 +36,12 @@
     liblog \
     libmediautils \
     libstagefright_foundation \
-    libutils
-ifneq ($(DISABLE_TREBLE_DRM), true)
-LOCAL_SHARED_LIBRARIES += \
+    libutils \
     android.hidl.base@1.0 \
     android.hardware.drm@1.0 \
     libhidlbase \
     libhidlmemory \
     libhidltransport
-endif
 
 LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall