summaryrefslogtreecommitdiff
authorJiyu Yang <jiyu.yang@amlogic.com>2015-10-08 10:23:53 (GMT)
committer Jiyu Yang <jiyu.yang@amlogic.com>2015-10-14 14:06:08 (GMT)
commit3fa5103cb59a06748617ffce320b3ad6abefa534 (patch)
tree54aca7c96e4e7566e1b64b4addde5c68f1298ba7
parent55bcd8660d470801190f74321b4185150719c80d (diff)
downloadscreen_source-3fa5103cb59a06748617ffce320b3ad6abefa534.zip
screen_source-3fa5103cb59a06748617ffce320b3ad6abefa534.tar.gz
screen_source-3fa5103cb59a06748617ffce320b3ad6abefa534.tar.bz2
PD#111243 update mk file for multi-gralloc
Change-Id: I8e81071aaa4f1b961290bc603fc29a25012e9718 Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
Diffstat
-rw-r--r--Android.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index cd8d533..d206bf9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,18 +10,14 @@ include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := aml_screen.cpp v4l2_vdin.cpp
-ifneq (,$(wildcard hardware/amlogic/gralloc))
- GRALLOC_DIR := hardware/amlogic/gralloc
-else
- GRALLOC_DIR := hardware/libhardware/modules/gralloc
-endif
+MESON_GRALLOC_DIR ?= hardware/amlogic/gralloc
LOCAL_C_INCLUDES += frameworks/native/include/utils \
frameworks/native/include/android \
system/core/include/utils \
system/core/libion/include \
system/core/libion/kernel-headers \
- $(GRALLOC_DIR)
+ $(MESON_GRALLOC_DIR)
LOCAL_SHARED_LIBRARIES:= libutils liblog libui