resolved conflicts for merge of 2e537299 to jb-dev-plus-aosp

Change-Id: I014fbc1b03a0b2c789b8094fcc6f0ea3242fb419

4 files changed, 16 insertions, 75 deletions

diff --git a/device.mk b/device.mk
index 92d9349..8da31fa 100644
--- a/device.mk
+++ b/device.mk
@@ -27,5 +27,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.config.vc_call_vol_steps=7
 
+PRODUCT_PACKAGES := \
+	CellBroadcastReceiver
+
 $(call inherit-product, device/samsung/tuna/device.mk)
 $(call inherit-product-if-exists, vendor/samsung/toroplus/device-vendor.mk)
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index f4acfa5..4ffb45d 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -14,42 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# 189728 = IRK82
-# 201178 = IRL10B
-# 213821 = ICL26
-# 221202 = ICL39
-# 236517 = IML70C
-# 237179 = IML73
-# 237867 = IML74B
-# 238432 = IML74E
-# 238649 = IML74G
-# 239410 = IML74K
-# 262866 = IMM30D
-# 299849 = IMM76D
-# end ics-mr1
-# start jb-dev
-# 241968 = IRM03
-# 397816 = JRO03B
-# 398337 = JRO03C
-# 405518 = JRO03H
-# 463694 = JZO54G
-# end jb-dev
-BRANCH=jb-dev
-if test $BRANCH=ics-mr1
-then
-  ZIP=mysid-ota-299849.zip
-  BUILD=imm76d
-fi #ics-mr1
-if test $BRANCH=jb-dev
-then
-  ZIP=mysid-ota-463694.zip
-  BUILD=jzo54g
-fi # jb-dev
+(cd ../../../../out/target/product/toroplus ; zip -r ../../../../device/samsung/toroplus/self-extractors/full_toroplus-pseudo_ota.zip system)
+ZIP=full_toroplus-pseudo_ota.zip
+BUILD=jzo54i
 ROOTDEVICE=toroplus
 DEVICE=toroplus
 MANUFACTURER=samsung
 
-for COMPANY in broadcom csr imgtec invensense nxp ti
+for COMPANY in broadcom csr imgtec invensense nxp samsung ti
 do
   echo Processing files from $COMPANY
   rm -rf tmp
@@ -98,10 +70,9 @@ do
   samsung)
     TO_EXTRACT="\
             system/app/BIP.apk \
-            system/app/CellBroadcastReceiver.apk \
             system/app/SDM.apk \
-            system/app/SecPhone.apk
-            system/app/Stk.apk \
+            system/app/SecPhone.apk \
+            system/app/SprintExtension.apk \
             system/app/SyncMLSvc.apk \
             system/bin/fRom \
             system/lib/libsecril-client.so \
diff --git a/self-extractors/samsung/staging/device-partial.mk b/self-extractors/samsung/staging/device-partial.mk
index 89d9a86..f131242 100644
--- a/self-extractors/samsung/staging/device-partial.mk
+++ b/self-extractors/samsung/staging/device-partial.mk
@@ -15,16 +15,13 @@
 # Samsung blob(s) necessary for ToroPlus hardware
 PRODUCT_PACKAGES := \
     BIP \
-    IMSFramework \
-    RTN \
     SDM \
-    SPG \
+    SecPhone \
+    SprintExtension \
     SyncMLSvc \
     fRom \
     libsecril-client \
     libsyncml_core \
     libsyncml_port \
     lib_gsd4t \
-    libims \
-    libims_jni \
     libsec-ril_lte
diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk
index d705011..4411c6d 100644
--- a/self-extractors/samsung/staging/proprietary/Android.mk
+++ b/self-extractors/samsung/staging/proprietary/Android.mk
@@ -27,17 +27,17 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := IMSFramework
+LOCAL_MODULE := SDM
 LOCAL_MODULE_OWNER := samsung
+LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := RTN
+LOCAL_MODULE := SecPhone
 LOCAL_MODULE_OWNER := samsung
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
@@ -47,17 +47,7 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := SDM
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := platform
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SPG
+LOCAL_MODULE := SprintExtension
 LOCAL_MODULE_OWNER := samsung
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
@@ -124,26 +114,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libims
-LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := libims.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libims_jni
-LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := libims_jni.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libsec-ril_lte
 LOCAL_MODULE_OWNER := samsung
 LOCAL_SRC_FILES := libsec-ril_lte.so