Merge branch 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm into d-nougat-released-nougat-release

* 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm:
  TEMP: disable bluetooth hardware feature
  Revert "jacinto6evm: changes for defining auto platform"
  jacinto6evm: add vsync offsets
  jacinto6evm: remove extra hardware feature
  jacinto6evm: media_codecs.xml: fix alignment value
  jacinto6evm: Set product files and packages for APPE based audio
  jacinto6evm: Add the 'radio_app' service
  jacinto6evm: Start lad_dra7xx with GateMP
  jacinto6evm: Set permissions for IPC daemon and device files
  jacinto6evm: Set 'media' user for i2c devices
  jacinto6evm: update ramdisk offset
  jacinto6evm: sepolicy: add rules for cpuset script
  jacinto6evm: sepolicy: update pvr module_load permission

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/audio/Android.mk b/audio/Android.mk
index 9e14b16..d73e0c1 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -13,4 +13,9 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
+
+ifeq ($(APPE_AUDIO),true)
+include $(LOCAL_PATH)/hdmi/Android.mk
+else
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif