From 3fa5103cb59a06748617ffce320b3ad6abefa534 Mon Sep 17 00:00:00 2001 From: Jiyu Yang Date: Thu, 08 Oct 2015 10:23:53 +0000 Subject: PD#111243 update mk file for multi-gralloc Change-Id: I8e81071aaa4f1b961290bc603fc29a25012e9718 Signed-off-by: Jiyu Yang --- 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 -- cgit