From 660aa9d2da64e265693ead517c45991bd8ab6896 Mon Sep 17 00:00:00 2001
From: Zhi Zhou<zhi.zhou@amlogic.com>
Date: Fri, 31  Mar  2017  08:55:56  +0000
Subject: PD#141694 move amavutils out of libplayer

Change-Id: I05b0f311d10f69a9b50cf89ea9a9806afd2474d9
---
diff --git a/hwc1.4/Android.mk b/hwc1.4/Android.mk
index 1d7cc85..13f18e3 100644
--- a/hwc1.4/Android.mk
+++ b/hwc1.4/Android.mk
@@ -3,7 +3,7 @@
 #
 
 LOCAL_PATH := $(call my-dir)
-
+include $(TOP)/hardware/amlogic/media/media_base_config.mk
 # HAL module implemenation, not prelinked and stored in
 # /system/lib/hw/hwcomposer.amlogic.so
 include $(CLEAR_VARS)
@@ -36,9 +36,8 @@ LOCAL_C_INCLUDES += system/core/libion/include/ \
 
 ifneq ($(WITH_LIBPLAYER_MODULE),false)
 LOCAL_SHARED_LIBRARIES += libamavutils_alsa
-AMPLAYER_APK_DIR=$(TOP)/vendor/amlogic/frameworks/av/LibPlayer/
 LOCAL_C_INCLUDES += \
-    $(AMPLAYER_APK_DIR)/amavutils/include
+    $(AMAVUTILS_PATH)/include
 LOCAL_CFLAGS += -DWITH_LIBPLAYER_MODULE=1
 endif
 
diff --git a/hwc2/platforms/Android.mk b/hwc2/platforms/Android.mk
index 079f7ac..fe6ab7a 100644
--- a/hwc2/platforms/Android.mk
+++ b/hwc2/platforms/Android.mk
@@ -3,7 +3,7 @@
 #
 
 LOCAL_PATH := $(call my-dir)
-
+include $(TOP)/hardware/amlogic/media/media_base_config.mk
 # HAL module implemenation, not prelinked and stored in
 # hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
 include $(CLEAR_VARS)
@@ -102,9 +102,7 @@ endif
 # WITH_LIBPLAYER_MODULE := true
 ifneq ($(WITH_LIBPLAYER_MODULE),false)
 LOCAL_SHARED_LIBRARIES += libamavutils_alsa
-AMPLAYER_APK_DIR := vendor/amlogic/frameworks/av/LibPlayer
-LOCAL_C_INCLUDES += $(AMPLAYER_APK_DIR)/amavutils/include
-$(info Libplayer is $(AMPLAYER_APK_DIR))
+LOCAL_C_INCLUDES += $(AMAVUTILS_PATH)/include
 LOCAL_CFLAGS += -DWITH_LIBPLAYER_MODULE=1
 endif
 
--
cgit