From d1d3683d4782bcda3ed26101c0b6e483c82a6764 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 2 Nov 2012 14:20:13 -0700
Subject: Update maguro self-extractors for JOB32B

Change-Id: I15aceb45768794e994a150957be6d0a1e8c52466
---
 self-extractors/broadcom/staging/device-partial.mk      |  3 +--
 self-extractors/broadcom/staging/proprietary/Android.mk | 10 ----------
 self-extractors/generate-packages.sh                    |  6 +++---
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/self-extractors/broadcom/staging/device-partial.mk b/self-extractors/broadcom/staging/device-partial.mk
index 21dd77f..118c94a 100644
--- a/self-extractors/broadcom/staging/device-partial.mk
+++ b/self-extractors/broadcom/staging/device-partial.mk
@@ -14,5 +14,4 @@
 
 # Broadcom blob(s) necessary for Maguro hardware
 PRODUCT_PACKAGES := \
-    bcm4330 \
-    libbt-vendor
+    bcm4330
diff --git a/self-extractors/broadcom/staging/proprietary/Android.mk b/self-extractors/broadcom/staging/proprietary/Android.mk
index b7ca827..888c48f 100644
--- a/self-extractors/broadcom/staging/proprietary/Android.mk
+++ b/self-extractors/broadcom/staging/proprietary/Android.mk
@@ -26,14 +26,4 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libbt-vendor
-LOCAL_MODULE_OWNER := broadcom
-LOCAL_SRC_FILES := libbt-vendor.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-include $(BUILD_PREBUILT)
-
 endif
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 881964b..85504cd 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -39,6 +39,7 @@
 # end jb-dev
 # start jb-mr1-dev
 # 465036 = JOO75
+# 521994 = JOP32B
 # end jb-mr1-dev
 BRANCH=jb-mr1-dev
 if test $BRANCH=ics-mr1
@@ -53,8 +54,8 @@ then
 fi # jb-dev
 if test $BRANCH=jb-mr1-dev
 then
-  ZIP=yakju-ota-465036.zip
-  BUILD=joo75
+  ZIP=yakju-ota-521994.zip
+  BUILD=jop32b
 fi # jb-mr1-dev
 ROOTDEVICE=maguro
 DEVICE=maguro
@@ -71,7 +72,6 @@ do
   broadcom)
     TO_EXTRACT="\
             system/vendor/firmware/bcm4330.hcd \
-            system/vendor/lib/libbt-vendor.so \
             "
     ;;
   csr)
-- 
cgit v1.1