commit bfe5c01b8109e775269a1f95f991056c2938bbe8
author Nick Sanders <nsanders@google.com> Mon Nov 26 15:03:31 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 26 15:03:31 2012 -0800
tree 215ba9a4245743559553a598e061f5f5314bf146
parent ae71a4fd1317e4dc1808a4a85dfb43687c138507
parent df9b42baf2a15dbb0a0dd2ad96a4dcf4aea7d19a

am df9b42ba: Fix references to omap4-aah

* commit 'df9b42baf2a15dbb0a0dd2ad96a4dcf4aea7d19a':
  Fix references to omap4-aah

camera/Android.mk

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 += -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 \

hwc/Android.mk

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_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