Reconcile with jb-mr1-release - do not merge
Change-Id: I706e132c92cf35fa435b8d4d0d7778d0452d081a
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 953bc6a..9816cd2 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -16,13 +16,14 @@
# start jb-mr1-dev
# 474128 = JOO86
+# 521994 = JOP32B
# end jb-mr1-dev
source ../../../common/clear-factory-images-variables.sh
-BUILD=474128
+BUILD=521994
DEVICE=manta
PRODUCT=mantaray
-VERSION=joo86
+VERSION=jop32b
#SRCPREFIX=signed-
-BOOTLOADER=mantali03
+BOOTLOADER=mantalj12
source ../../../common/generate-factory-images-common.sh
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 7610d79..da17a30 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -19,12 +19,13 @@
# 474128 = JOO86
# 476441 = JOO87B
# 483070 = JOP01
+# 521994 = JOP32B
# end jb-mr1-dev
BRANCH=jb-mr1-dev
if test $BRANCH=jb-mr1-dev
then
- ZIP=mantaray-ota-483070.zip
- BUILD=jop01
+ ZIP=mantaray-ota-521994.zip
+ BUILD=jop32b
fi # jb-dev
ROOTDEVICE=manta
DEVICE=manta
@@ -55,8 +56,6 @@
system/vendor/firmware/fimc_is_fw.bin \
system/vendor/firmware/fimc_is_fw2.bin \
system/vendor/firmware/maxtouch.fw \
- system/vendor/firmware/maxtouch_hv.fw \
- system/vendor/firmware/maxtouch_nv.fw \
system/vendor/firmware/mfc_fw.bin \
system/vendor/firmware/setfile.bin \
system/vendor/firmware/setfile_4e5.bin \
diff --git a/self-extractors/samsung/staging/device-partial.mk b/self-extractors/samsung/staging/device-partial.mk
index dfbe798..8d6d1f8 100644
--- a/self-extractors/samsung/staging/device-partial.mk
+++ b/self-extractors/samsung/staging/device-partial.mk
@@ -17,8 +17,6 @@
fimc_is_fw \
fimc_is_fw2 \
maxtouch \
- maxtouch_hv \
- maxtouch_nv \
mfc_fw \
setfile \
setfile_4e5 \
diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk
index 35c763b..aded7a0 100644
--- a/self-extractors/samsung/staging/proprietary/Android.mk
+++ b/self-extractors/samsung/staging/proprietary/Android.mk
@@ -47,26 +47,6 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := maxtouch_hv
-LOCAL_SRC_FILES := maxtouch_hv.fw
-LOCAL_MODULE_SUFFIX := .fw
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := maxtouch_nv
-LOCAL_SRC_FILES := maxtouch_nv.fw
-LOCAL_MODULE_SUFFIX := .fw
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := mfc_fw
LOCAL_SRC_FILES := mfc_fw.bin
LOCAL_MODULE_SUFFIX := .bin
