| author | Kasin Lee <kasin.li@amlogic.com> | 2013-08-28 05:16:25 (GMT) |
|---|---|---|
| committer | Lawrence Mok <lawrence.mok@amlogic.com> | 2013-08-28 07:16:46 (GMT) |
| commit | 5f91521693b2c0dc3bae6097c7f8d19546fbd68d (patch) | |
| tree | bee50556cc0db8c20348b830b228d9320f896772 | |
| parent | 0fbd884d35494abcc2ca0fe0d37f527e4e084f41 (diff) | |
| download | camera-5f91521693b2c0dc3bae6097c7f8d19546fbd68d.zip camera-5f91521693b2c0dc3bae6097c7f8d19546fbd68d.tar.gz camera-5f91521693b2c0dc3bae6097c7f8d19546fbd68d.tar.bz2 | |
gralloc was moved to new addrass
| -rwxr-xr-x | Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -45,6 +45,12 @@ LOCAL_SRC_FILES:= \ $(CAMERA_UTILS_SRC) \ $(CAMERA_HAL_JPEG_SRC) +ifneq (,$(wildcard hardware/amlogic/gralloc)) +GRALLOC_DIR := hardware/amlogic/gralloc +else +GRALLOC_DIR := hardware/libhardware/modules/gralloc +endif + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/inc/ \ $(LOCAL_PATH)/utils \ @@ -54,9 +60,9 @@ LOCAL_C_INCLUDES += \ frameworks/base/include/media/stagefright \ external/jhead/ \ external/jpeg/ \ - hardware/libhardware/modules/gralloc/ \ frameworks/native/include/media/hardware \ - $(LOCAL_PATH)/inc/mjpeg/ + $(LOCAL_PATH)/inc/mjpeg/ \ + $(GRALLOC_DIR) LOCAL_C_INCLUDES_VIRCAM := \ $(LOCAL_PATH)/vircam/inc |