Keep up with ICS changes

Change-Id: If20457060bb8a690c8415be755ae87d1114f4d5d

4 files changed, 3 insertions, 26 deletions

diff --git a/self-extractors/broadcom/staging/device-crespo.mk b/self-extractors/broadcom/staging/device-crespo.mk
index fa3825e..d1d1ad1 100644
--- a/self-extractors/broadcom/staging/device-crespo.mk
+++ b/self-extractors/broadcom/staging/device-crespo.mk
@@ -14,9 +14,6 @@
 
 # Broadcom blobs necessary for crespo
 PRODUCT_COPY_FILES := \
-    vendor/broadcom/crespo/proprietary/gps.conf:system/etc/gps.conf \
     vendor/broadcom/crespo/proprietary/gpsd:system/vendor/bin/gpsd \
-    vendor/broadcom/crespo/proprietary/gps.xml:system/vendor/etc/gps.xml \
     vendor/broadcom/crespo/proprietary/bcm4329.hcd:system/vendor/firmware/bcm4329.hcd \
-    vendor/broadcom/crespo/proprietary/nvram_net.txt:system/vendor/firmware/nvram_net.txt \
     vendor/broadcom/crespo/proprietary/gps.s5pc110.so:system/vendor/lib/hw/gps.s5pc110.so
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index a782c53..2946816 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -24,8 +24,9 @@
 # 120505 = GRJ18
 # 121341 = GRJ22
 # 128018 = IRJ54
-ZIP=soju-ota-128018.*.zip
-BUILD=irj54
+# 128447 = IRJ55
+ZIP=soju-ota-128447.zip
+BUILD=irj55
 ROOTDEVICE=crespo
 DEVICE=crespo
 MANUFACTURER=samsung
diff --git a/self-extractors/imgtec/staging/overlay/packages/apps/Launcher2/res/layout/all_apps.xml b/self-extractors/imgtec/staging/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
deleted file mode 100644
index daf1b6f..0000000
--- a/self-extractors/imgtec/staging/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- switch to all_apps_3d on devices that support RenderScript -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include layout="@layout/all_apps_3d" />
-</merge>
diff --git a/self-extractors/samsung/staging/device-crespo.mk b/self-extractors/samsung/staging/device-crespo.mk
index 2b421c1..aa0fb45 100644
--- a/self-extractors/samsung/staging/device-crespo.mk
+++ b/self-extractors/samsung/staging/device-crespo.mk
@@ -19,5 +19,4 @@ PRODUCT_COPY_FILES := \
 # Samsung blobs necessary for crespo
 PRODUCT_COPY_FILES += \
     vendor/samsung/crespo/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
-    vendor/samsung/crespo/proprietary/samsung_mfc_fw.bin:system/vendor/firmware/samsung_mfc_fw.bin \
     vendor/samsung/crespo/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so