summaryrefslogtreecommitdiff
authorLawrence Mok <lawrence.mok@amlogic.com>2018-03-02 02:59:11 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2018-03-02 02:59:11 (GMT)
commit7fe487e8572d70423c23dbe5d3ccaed22fc54919 (patch)
tree7365556c89cc4173afd5169d897bf180193ac4f6
parent8bde37186fb3cdb008b92e282cd3bac42eae4db5 (diff)
parent8abe69e1bb113a73d253276af269adb83369d607 (diff)
downloadmedia_modules-7fe487e8572d70423c23dbe5d3ccaed22fc54919.zip
media_modules-7fe487e8572d70423c23dbe5d3ccaed22fc54919.tar.gz
media_modules-7fe487e8572d70423c23dbe5d3ccaed22fc54919.tar.bz2
Merge "media_modules: build system changed for Android.mk from P [21/28]" into amlogic-4.9-dev
Diffstat
-rw-r--r--Media.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/Media.mk b/Media.mk
index 11c9ec7..494d003 100644
--- a/Media.mk
+++ b/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