diff options
| author | Nick Sanders <nsanders@google.com> | 2012-11-26 15:05:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-26 15:05:45 -0800 |
| commit | b9714395f7001a1cf2b9fe405865622244b455a0 (patch) | |
| tree | 215ba9a4245743559553a598e061f5f5314bf146 | |
| parent | e103f5c2e55afb793d61dddbbeabf078df199ca1 (diff) | |
| parent | bfe5c01b8109e775269a1f95f991056c2938bbe8 (diff) | |
| download | omap4-aah-b9714395f7001a1cf2b9fe405865622244b455a0.tar.gz | |
am bfe5c01b: am df9b42ba: Fix references to omap4-aah
* commit 'bfe5c01b8109e775269a1f95f991056c2938bbe8':
Fix references to omap4-aah
| -rwxr-xr-x | camera/Android.mk | 4 | ||||
| -rw-r--r-- | hwc/Android.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 90f95c1..cb97d20 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -48,8 +48,8 @@ CAMERAHAL_CFLAGS += -DENHANCED_DOMX CAMERAHAL_CFLAGS += -DLOG_TAG=\"CameraHal\" TI_CAMERAHAL_COMMON_INCLUDES := \ - hardware/ti/omap4xxx/tiler \ - hardware/ti/omap4xxx/hwc \ + hardware/ti/omap4-aah/tiler \ + hardware/ti/omap4-aah/hwc \ external/jpeg \ external/jhead \ $(LOCAL_PATH)/../libtiutils \ diff --git a/hwc/Android.mk b/hwc/Android.mk index 81ad059..c58d692 100644 --- a/hwc/Android.mk +++ b/hwc/Android.mk @@ -18,7 +18,9 @@ LOCAL_MODULE := hwcomposer.omap4 LOCAL_CFLAGS := -DLOG_TAG=\"ti_hwc\" LOCAL_C_INCLUDES += \ external/libpng external/zlib \ - $(HARDWARE_TI_OMAP4_BASE)/kernel-headers-ti + $(HARDWARE_TI_OMAP4_BASE)/kernel-headers-ti \ + $(HARDWARE_TI_OMAP4_BASE)/kernel-headers + # LOG_NDEBUG=0 means verbose logging enabled # LOCAL_CFLAGS += -DLOG_NDEBUG=0 |