fix hardware/ti/omap4xxx references

8 files changed, 13 insertions, 14 deletions

diff --git a/Android.mk b/Android.mk
index ab7d6f8..8418c63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,8 +13,8 @@ ifeq ($(OMAP4_DEBUG_MEMLEAK),true)
 OMAP4_DEBUG_CFLAGS:= -DHEAPTRACKER
 OMAP4_DEBUG_LDFLAGS:= $(foreach f, $(strip malloc realloc calloc free), -Wl,--wrap=$(f))
 OMAP4_DEBUG_SHARED_LIBRARIES:= liblog
-BUILD_HEAPTRACKED_SHARED_LIBRARY:= hardware/ti/omap4xxx/heaptracked-shared-library.mk
-BUILD_HEAPTRACKED_EXECUTABLE:= hardware/ti/omap4xxx/heaptracked-executable.mk
+BUILD_HEAPTRACKED_SHARED_LIBRARY:= $(HARDWARE_TI_OMAP4_BASE)/heaptracked-shared-library.mk
+BUILD_HEAPTRACKED_EXECUTABLE:= $(HARDWARE_TI_OMAP4_BASE)/heaptracked-executable.mk
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
diff --git a/camera/Android.mk b/camera/Android.mk
index bdb5309..a7b3c9f 100755
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -49,8 +49,8 @@ endif
 CAMERAHAL_CFLAGS += -DLOG_TAG=\"CameraHal\"
 
 TI_CAMERAHAL_COMMON_INCLUDES := \
-    hardware/ti/omap4xxx/include \
-    hardware/ti/omap4xxx/hwc \
+    $(LOCAL_PATH)/../include \
+    $(LOCAL_PATH)/../hwc \
     external/jpeg \
     external/jhead \
     $(LOCAL_PATH)/../libtiutils \
diff --git a/domx/Android.mk b/domx/Android.mk
index 9003fe6..f2a6cef 100644
--- a/domx/Android.mk
+++ b/domx/Android.mk
@@ -6,7 +6,6 @@ ifeq ($(ENHANCED_DOMX),true)
     ifneq ($(TARGET_BOARD_PLATFORM),omap3)
 
         LOCAL_PATH:= $(call my-dir)
-        HARDWARE_TI_OMAP4_BASE:= $(LOCAL_PATH)/../omap4xxx
         OMAP4_DEBUG_MEMLEAK:= false
 
         ifeq ($(OMAP4_DEBUG_MEMLEAK),true)
@@ -14,8 +13,8 @@ ifeq ($(ENHANCED_DOMX),true)
             OMAP4_DEBUG_CFLAGS:= -DHEAPTRACKER
             OMAP4_DEBUG_LDFLAGS:= $(foreach f, $(strip malloc realloc calloc free), -Wl,--wrap=$(f))
             OMAP4_DEBUG_SHARED_LIBRARIES:= liblog
-            BUILD_HEAPTRACKED_SHARED_LIBRARY:= hardware/ti/omap4xxx/heaptracked-shared-library.mk
-            BUILD_HEAPTRACKED_EXECUTABLE:= hardware/ti/omap4xxx/heaptracked-executable.mk
+            BUILD_HEAPTRACKED_SHARED_LIBRARY:= $(HARDWARE_TI_OMAP4_BASE)/heaptracked-shared-library.mk
+            BUILD_HEAPTRACKED_EXECUTABLE:= $(HARDWARE_TI_OMAP4_BASE)/heaptracked-executable.mk
 
             LOCAL_PATH:= $(call my-dir)
             include $(CLEAR_VARS)
diff --git a/libtiutils/Android.mk b/libtiutils/Android.mk
index 15a86e5..dcd7cbe 100644
--- a/libtiutils/Android.mk
+++ b/libtiutils/Android.mk
@@ -38,8 +38,8 @@ LOCAL_C_INCLUDES += \
     $(DOMX_PATH)/mm_osal/inc
 else
 LOCAL_C_INCLUDES += \
-    hardware/ti/omap4xxx/domx/omx_core/inc \
-    hardware/ti/omap4xxx/domx/mm_osal/inc
+    $(HARDWARE_TI_OMAP4_BASE)/domx/omx_core/inc \
+    $(HARDWARE_TI_OMAP4_BASE)/domx/mm_osal/inc
 endif
 
 LOCAL_CFLAGS += -fno-short-enums $(ANDROID_API_CFLAGS)
diff --git a/omap4.mk b/omap4.mk
index 436c172..e29e17d 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -19,6 +19,6 @@ PRODUCT_PACKAGES += \
     camera.omap4 \
     hwcomposer.omap4
 
-PRODUCT_VENDOR_KERNEL_HEADERS := hardware/ti/omap4xxx/kernel-headers
+PRODUCT_VENDOR_KERNEL_HEADERS := hardware/ti/omap4-next/kernel-headers
 
-$(call inherit-product, hardware/ti/omap4xxx/common.mk)
+$(call inherit-product, hardware/ti/omap4-next/common.mk)
diff --git a/omap5.mk b/omap5.mk
index 6822e11..288d1ba 100644
--- a/omap5.mk
+++ b/omap5.mk
@@ -19,4 +19,4 @@ PRODUCT_PACKAGES += \
     camera.omap5 \
     hwcomposer.omap5
 
-$(call inherit-product, hardware/ti/omap4xxx/common.mk)
+$(call inherit-product, hardware/ti/omap4-next/common.mk)
diff --git a/test/CameraHal/Android.mk b/test/CameraHal/Android.mk
index ad7aad5..8d34e81 100644
--- a/test/CameraHal/Android.mk
+++ b/test/CameraHal/Android.mk
@@ -80,7 +80,7 @@ LOCAL_SHARED_LIBRARIES += \
 endif
 
 LOCAL_C_INCLUDES += \
-    hardware/ti/omap4xxx/include \
+    $(HARDWARE_TI_OMAP4_BASE)/include \
 	frameworks/base/include/ui \
 	frameworks/base/include/surfaceflinger \
 	frameworks/base/include/camera \
diff --git a/test/VTC/Android.mk b/test/VTC/Android.mk
index a3ba5ea..3795ec2 100644
--- a/test/VTC/Android.mk
+++ b/test/VTC/Android.mk
@@ -47,7 +47,7 @@ LOCAL_SRC_FILES := VTCLoopback.cpp IOMXEncoder.cpp IOMXDecoder.cpp
 
 LOCAL_C_INCLUDES += \
     $(DOMX_PATH)/omx_core/inc \
-    $(TOP)/hardware/ti/omap4xxx/libtiutils
+    $(HARDWARE_TI_OMAP4_BASE)/libtiutils
 
 ifdef ANDROID_API_JB_OR_LATER
 LOCAL_C_INCLUDES += \