From b87a3bac14a17db0e70364081786b582d9a2832f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 13 Sep 2012 10:38:05 -0700
Subject: [PATCH] Update for JZO54G, point to proper toroplus

Change-Id: I5f4d33166b5acdd3f752985fa96fda3426a9eeed
---
 self-extractors/broadcom/staging/proprietary/Android.mk   | 2 +-
 self-extractors/csr/staging/proprietary/Android.mk        | 2 +-
 self-extractors/generate-packages.sh                      | 5 +++--
 self-extractors/imgtec/staging/proprietary/Android.mk     | 2 +-
 self-extractors/invensense/staging/proprietary/Android.mk | 2 +-
 self-extractors/nxp/staging/proprietary/Android.mk        | 2 +-
 self-extractors/samsung/staging/proprietary/Android.mk    | 2 +-
 self-extractors/ti/staging/proprietary/Android.mk         | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/self-extractors/broadcom/staging/proprietary/Android.mk b/self-extractors/broadcom/staging/proprietary/Android.mk
index 3a2454b..2e5474c 100644
--- a/self-extractors/broadcom/staging/proprietary/Android.mk
+++ b/self-extractors/broadcom/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := bcm4330
diff --git a/self-extractors/csr/staging/proprietary/Android.mk b/self-extractors/csr/staging/proprietary/Android.mk
index fa9d102..5f9a70b 100644
--- a/self-extractors/csr/staging/proprietary/Android.mk
+++ b/self-extractors/csr/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := gps.omap4
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index d0811a7..0c8e28d 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -32,6 +32,7 @@
 # 397816 = JRO03B
 # 398337 = JRO03C
 # 405518 = JRO03H
+# 463694 = JZO54G
 # end jb-dev
 BRANCH=jb-dev
 if test $BRANCH=ics-mr1
@@ -41,8 +42,8 @@ then
 fi #ics-mr1
 if test $BRANCH=jb-dev
 then
-  ZIP=mysid-ota-405518.zip
-  BUILD=jro03h
+  ZIP=mysid-ota-463694.zip
+  BUILD=jzo54g
 fi # jb-dev
 ROOTDEVICE=toroplus
 DEVICE=toroplus
diff --git a/self-extractors/imgtec/staging/proprietary/Android.mk b/self-extractors/imgtec/staging/proprietary/Android.mk
index c82a004..bf2da50 100644
--- a/self-extractors/imgtec/staging/proprietary/Android.mk
+++ b/self-extractors/imgtec/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := pvrsrvctl
diff --git a/self-extractors/invensense/staging/proprietary/Android.mk b/self-extractors/invensense/staging/proprietary/Android.mk
index 9df7d74..c4f537b 100644
--- a/self-extractors/invensense/staging/proprietary/Android.mk
+++ b/self-extractors/invensense/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libinvensense_mpl
diff --git a/self-extractors/nxp/staging/proprietary/Android.mk b/self-extractors/nxp/staging/proprietary/Android.mk
index 9719589..2f6fff3 100644
--- a/self-extractors/nxp/staging/proprietary/Android.mk
+++ b/self-extractors/nxp/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libpn544_fw
diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk
index c4eb582..d705011 100644
--- a/self-extractors/samsung/staging/proprietary/Android.mk
+++ b/self-extractors/samsung/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := BIP
diff --git a/self-extractors/ti/staging/proprietary/Android.mk b/self-extractors/ti/staging/proprietary/Android.mk
index daf881a..b2d1ea2 100644
--- a/self-extractors/ti/staging/proprietary/Android.mk
+++ b/self-extractors/ti/staging/proprietary/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifeq ($(TARGET_DEVICE),toroplus)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := ducati-m3