commit 73e17f219e9ebcf45d6bc471b00b981428a4bc62
author Eric Laurent <elaurent@google.com> Mon Nov 21 10:40:36 2016 -0800
committer Eric Laurent <elaurent@google.com> Mon Nov 21 10:40:36 2016 -0800
tree 61a2c6ca6485a59e0efe3e968ce211b8eb6a36e6
parent 48d8020342a4de6b0b925328ddbdfe34f22253a3

Revert "Revert "broadcast radio: initial support for HIDL HAL""

This reverts commit 9a24e9127481b222c338dcbecef8394eaf899d51.

services/radio/Android.mk

diff --git a/services/radio/Android.mk b/services/radio/Android.mk
index b4cda19..d13535f 100644
--- a/services/radio/Android.mk
+++ b/services/radio/Android.mk
@@ -17,9 +17,8 @@
 include $(CLEAR_VARS)
 
 
-LOCAL_SRC_FILES:=               \
-    RadioService.cpp \
-    RadioHalLegacy.cpp
+LOCAL_SRC_FILES:= \
+    RadioService.cpp
 
 LOCAL_SHARED_LIBRARIES:= \
     liblog \
@@ -31,6 +30,25 @@
     libradio \
     libradio_metadata
 
+ifeq ($(ENABLE_TREBLE),true)
+# Treble configuration
+LOCAL_CFLAGS += -DENABLE_TREBLE
+LOCAL_SRC_FILES += \
+    HidlUtils.cpp \
+    RadioHalHidl.cpp
+
+LOCAL_SHARED_LIBRARIES += \
+    libhwbinder \
+    libhidl \
+    libbase \
+    android.hardware.broadcastradio@1.0
+else
+# libhardware configuration
+LOCAL_SRC_FILES +=               \
+    RadioHalLegacy.cpp
+endif
+
+
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 
 LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)