change location references from omap4-next to omap4

Change-Id: I6e1c712b8320527e52b02b0e90a7e8340e93ccec

5 files changed, 6 insertions, 6 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 9eed673..ab0f86c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OMAP4_NEXT_FOLDER := hardware/ti/omap4-next
+OMAP4_NEXT_FOLDER := hardware/ti/omap4
 
 # Processor
 TARGET_CPU_ABI := armeabi-v7a
diff --git a/bltsville/ticpu/Android.mk b/bltsville/ticpu/Android.mk
index f9716ba..d0d05d2 100755
--- a/bltsville/ticpu/Android.mk
+++ b/bltsville/ticpu/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 #Copying libbltsville_ticpu.BV_CPUVERSION.so
 include $(CLEAR_VARS)
 BV_CPUVERSION :=$(shell ls $(HARDWARE_TI_OMAP4_BASE)/bltsville/ticpu/lib/android/libbltsville_*.*.so|\
-             sed 's/hardware\/ti\/omap4-next\/bltsville\/ticpu\/lib\/android\/libbltsville_ticpu.//')
+             sed 's/hardware\/ti\/omap4\/bltsville\/ticpu\/lib\/android\/libbltsville_ticpu.//')
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE := libbltsville_ticpu.$(BV_CPUVERSION)
diff --git a/common.mk b/common.mk
index e12064e..3a35945 100644
--- a/common.mk
+++ b/common.mk
@@ -15,7 +15,7 @@
 # This file lists the modules that are specific to OMAP4 but are used by
 # all OMAP4 devices.
 
-DEVICE_PACKAGE_OVERLAYS += hardware/ti/omap4-next/overlay
+DEVICE_PACKAGE_OVERLAYS += hardware/ti/omap4/overlay
 
 PRODUCT_PACKAGES += \
     libdomx \
diff --git a/omap4.mk b/omap4.mk
index 46977c8..6a5c590 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -18,6 +18,6 @@
 PRODUCT_PACKAGES += \
     hwcomposer.omap4
 
-PRODUCT_VENDOR_KERNEL_HEADERS := hardware/ti/omap4-next/kernel-headers
+PRODUCT_VENDOR_KERNEL_HEADERS := hardware/ti/omap4/kernel-headers
 
-$(call inherit-product, hardware/ti/omap4-next/common.mk)
+$(call inherit-product, hardware/ti/omap4/common.mk)
diff --git a/omap5.mk b/omap5.mk
index 288d1ba..bf993d3 100644
--- a/omap5.mk
+++ b/omap5.mk
@@ -19,4 +19,4 @@ PRODUCT_PACKAGES += \
     camera.omap5 \
     hwcomposer.omap5
 
-$(call inherit-product, hardware/ti/omap4-next/common.mk)
+$(call inherit-product, hardware/ti/omap4/common.mk)