| author | Kasin Lee <kasin.li@amlogic.com> | 2013-08-28 05:17:19 (GMT) |
|---|---|---|
| committer | Lawrence Mok <lawrence.mok@amlogic.com> | 2013-08-28 07:17:39 (GMT) |
| commit | db07ee177a82544ac94a115389f3a7d459449b1f (patch) | |
| tree | b52202c6f916b2a9850dd56bc94b38c43b0dce6c | |
| parent | d522255059b7a6a07704ccabe388f2ca2fc4d76f (diff) | |
| download | hwcomposer-db07ee177a82544ac94a115389f3a7d459449b1f.zip hwcomposer-db07ee177a82544ac94a115389f3a7d459449b1f.tar.gz hwcomposer-db07ee177a82544ac94a115389f3a7d459449b1f.tar.bz2 | |
gralloc was moved to new addrass
| -rwxr-xr-x | Android.mk | 9 | ||||
| -rwxr-xr-x | hwcomposer.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -11,9 +11,16 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog libEGL libutils libamavutils libcutils LOCAL_SRC_FILES := hwcomposer.cpp +ifneq (,$(wildcard hardware/amlogic/gralloc)) +GRALLOC_DIR := hardware/amlogic/gralloc +else +GRALLOC_DIR := hardware/libhardware/modules/gralloc +endif + AMPLAYER_APK_DIR=$(TOP)/packages/amlogic/LibPlayer/ LOCAL_C_INCLUDES +=\ - $(AMPLAYER_APK_DIR)/amavutils/include + $(AMPLAYER_APK_DIR)/amavutils/include \ + $(GRALLOC_DIR) \ LOCAL_MODULE := hwcomposer.amlogic LOCAL_CFLAGS:= -DLOG_TAG=\"hwcomposer\" diff --git a/hwcomposer.cpp b/hwcomposer.cpp index 22da4c7..b37a33b 100755 --- a/hwcomposer.cpp +++ b/hwcomposer.cpp @@ -48,7 +48,7 @@ #include <utils/Vector.h> #include <utils/Timers.h> // for private_handle_t -#include "../../libhardware/modules/gralloc/gralloc_priv.h" +#include <gralloc_priv.h> #include <Amavutils.h> #include <system/graphics.h> |