From 4038ecf3fb4f8feb4fe095caef0f1f3d810bf340 Mon Sep 17 00:00:00 2001
From: Tellen Yu <tellen.yu@amlogic.com>
Date: Thu, 8 Feb 2018 17:22:14 +0800
Subject: [PATCH] media_modules: build system changed for Android.mk from P
 [21/28]

PD# NONE

https://android.googlesource.com/platform/build/+/master/Changes.md

Change-Id: I46221a53a1db08c178ef43aaa09d907e43bfd10a
---
 drivers/amlogic/Media.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/amlogic/Media.mk b/drivers/amlogic/Media.mk
index 11c9ec7c5f27..494d0034d9b3 100644
--- a/drivers/amlogic/Media.mk
+++ b/drivers/amlogic/Media.mk
@@ -24,10 +24,10 @@ $(foreach m, $(shell find $(strip $(1)) -name "*.ko"),\
 	$(shell cp $(m) $(strip $(2)) -rfa))
 endef
 
-ifneq (,$(ANDROID_BUILD_TOP))
-KDIR := $(OUT)/obj/KERNEL_OBJ/
+ifneq (,$(TOP))
+KDIR := $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ/
 
-MEDIA_DRIVERS := $(ANDROID_BUILD_TOP)/hardware/amlogic/media_modules/drivers
+MEDIA_DRIVERS := $(TOP)/hardware/amlogic/media_modules/drivers
 ifeq (,$(wildcard $(MEDIA_DRIVERS)))
 $(error No find the dir of drivers.)
 endif
@@ -37,17 +37,17 @@ ifeq (,$(wildcard $(INCLUDE)))
 $(error No find the dir of include.)
 endif
 
-MEDIA_MODULES := $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/obj/media_modules
+MEDIA_MODULES := $(shell pwd)/$(PRODUCT_OUT)/obj/media_modules
 ifeq (,$(wildcard $(MEDIA_MODULES)))
 $(shell mkdir $(MEDIA_MODULES) -p)
 endif
 
-MODS_OUT := $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/obj/lib_vendor
+MODS_OUT := $(shell pwd)/$(PRODUCT_OUT)/obj/lib_vendor
 ifeq (,$(wildcard $(MODS_OUT)))
 $(shell mkdir $(MODS_OUT) -p)
 endif
 
-UCODE_OUT := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/firmware/video
+UCODE_OUT := $(shell pwd)/$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/firmware/video
 ifeq (,$(wildcard $(UCODE_OUT)))
 $(shell mkdir $(UCODE_OUT) -p)
 endif