Package binaries for JB MR2
Change-Id: If89c66bdf4502c153b8ec88ec37ed98e732d3c99
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 51757fc..f20e791 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -28,7 +28,10 @@
# 551245 = JDP82
# 573038 = JDQ39
# end jb-mr1.1-dev
-BRANCH=jb-mr1.1-dev
+# start jb-mr2-dev
+# 637162 = JWR11B
+# end jb-mr2-dev
+BRANCH=jb-mr2-dev
if test $BRANCH = jb-mr1-dev
then
ZIP=mantaray-ota-527662.zip
@@ -39,6 +42,11 @@
ZIP=mantaray-ota-573038
BUILD=jdq39
fi # jb-mr1.1-dev
+if test $BRANCH = jb-mr2-dev
+then
+ ZIP=mantaray-ota-637162
+ BUILD=jwr11b
+fi # jb-mr2-dev
ROOTDEVICE=manta
DEVICE=manta
MANUFACTURER=samsung
@@ -65,28 +73,22 @@
;;
samsung)
TO_EXTRACT="\
+ system/vendor/firmware/fimc_is_fw.bin \
system/vendor/firmware/fimc_is_fw2.bin \
+ system/vendor/firmware/maxtouch.fw \
system/vendor/firmware/mfc_fw.bin \
+ system/vendor/firmware/setfile.bin \
system/vendor/firmware/setfile_4e5.bin \
system/vendor/firmware/setfile_6a3.bin \
system/vendor/lib/egl/libGLES_mali.so \
- "
- ;;
- samsung_unlicensed)
- TO_EXTRACT="\
- system/vendor/firmware/fimc_is_fw.bin \
- system/vendor/firmware/maxtouch.fw \
- system/vendor/firmware/setfile.bin \
system/vendor/lib/libbccArm.sha1.so \
- system/vendor/lib/libbccArm.so \
- system/vendor/lib/libbcinfoArm.so \
- system/vendor/lib/libclcoreArm.bc \
- system/vendor/lib/libclcore_neonArm.bc \
- system/vendor/lib/libdrmdecrypt.so \
+ system/vendor/lib/libmalicore.bc \
system/vendor/lib/libRSDriverArm.so \
+ system/vendor/lib/libstagefright_hdcp.so \
system/vendor/secapp/00060308060501020000000000000000.tlbin \
system/vendor/secapp/020a0000000000000000000000000000.drbin \
system/vendor/secapp/07060000000000000000000000000000.tlbin \
+ system/vendor/secapp/ffffffff000000000000000000000005.tlbin \
"
;;
esac
diff --git a/self-extractors/samsung/staging/device-partial.mk b/self-extractors/samsung/staging/device-partial.mk
index 3bcd311..9069ec9 100644
--- a/self-extractors/samsung/staging/device-partial.mk
+++ b/self-extractors/samsung/staging/device-partial.mk
@@ -14,8 +14,20 @@
# Samsung blob(s) necessary for Manta hardware
PRODUCT_PACKAGES := \
+ fimc_is_fw \
fimc_is_fw2 \
+ maxtouch \
mfc_fw \
+ setfile \
setfile_4e5 \
setfile_6a3 \
- libGLES_mali
+ libGLES_mali \
+ libbccArm.sha1 \
+ libmalicore \
+ libRSDriverArm \
+ libstagefright_hdcp \
+ 00060308060501020000000000000000 \
+ 020a0000000000000000000000000000 \
+ 07060000000000000000000000000000 \
+ ffffffff000000000000000000000005 \
+
diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk
index a7cbf71..1fc1bbd 100644
--- a/self-extractors/samsung/staging/proprietary/Android.mk
+++ b/self-extractors/samsung/staging/proprietary/Android.mk
@@ -17,6 +17,16 @@
ifeq ($(TARGET_DEVICE),manta)
include $(CLEAR_VARS)
+LOCAL_MODULE := fimc_is_fw
+LOCAL_SRC_FILES := fimc_is_fw.bin
+LOCAL_MODULE_SUFFIX := .bin
+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 := fimc_is_fw2
LOCAL_SRC_FILES := fimc_is_fw2.bin
LOCAL_MODULE_SUFFIX := .bin
@@ -27,6 +37,16 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := maxtouch
+LOCAL_SRC_FILES := maxtouch.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
@@ -37,6 +57,16 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := setfile
+LOCAL_SRC_FILES := setfile.bin
+LOCAL_MODULE_SUFFIX := .bin
+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 := setfile_4e5
LOCAL_SRC_FILES := setfile_4e5.bin
LOCAL_MODULE_SUFFIX := .bin
@@ -66,4 +96,84 @@
LOCAL_MODULE_OWNER := samsung_arm
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libbccArm.sha1
+LOCAL_SRC_FILES := libbccArm.sha1.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung_arm
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmalicore
+LOCAL_SRC_FILES := libmalicore.bc
+LOCAL_MODULE_SUFFIX := .bc
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung_arm
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libRSDriverArm
+LOCAL_SRC_FILES := libRSDriverArm.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung_arm
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libstagefright_hdcp
+LOCAL_SRC_FILES := libstagefright_hdcp.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := 00060308060501020000000000000000
+LOCAL_SRC_FILES := 00060308060501020000000000000000.tlbin
+LOCAL_MODULE_SUFFIX := .tlbin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := 020a0000000000000000000000000000
+LOCAL_SRC_FILES := 020a0000000000000000000000000000.drbin
+LOCAL_MODULE_SUFFIX := .drbin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := 07060000000000000000000000000000
+LOCAL_SRC_FILES := 07060000000000000000000000000000.tlbin
+LOCAL_MODULE_SUFFIX := .tlbin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ffffffff000000000000000000000005
+LOCAL_SRC_FILES := ffffffff000000000000000000000005.tlbin
+LOCAL_MODULE_SUFFIX := .tlbin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+include $(BUILD_PREBUILT)
+
endif
diff --git a/self-extractors/samsung_unlicensed/COPYRIGHT b/self-extractors/samsung_unlicensed/COPYRIGHT
deleted file mode 100644
index 1a99053..0000000
--- a/self-extractors/samsung_unlicensed/COPYRIGHT
+++ /dev/null
@@ -1 +0,0 @@
-# (C) Samsung / ARM - All Rights Reserved.
diff --git a/self-extractors/samsung_unlicensed/LICENSE b/self-extractors/samsung_unlicensed/LICENSE
deleted file mode 100644
index 7dd3657..0000000
--- a/self-extractors/samsung_unlicensed/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-SAMSUNG/ARM LICENSE GOES HERE
diff --git a/self-extractors/samsung_unlicensed/staging/BoardConfigPartial.mk b/self-extractors/samsung_unlicensed/staging/BoardConfigPartial.mk
deleted file mode 100644
index 6c43eeb..0000000
--- a/self-extractors/samsung_unlicensed/staging/BoardConfigPartial.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2012 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.
diff --git a/self-extractors/samsung_unlicensed/staging/device-partial.mk b/self-extractors/samsung_unlicensed/staging/device-partial.mk
deleted file mode 100644
index cc7bd91..0000000
--- a/self-extractors/samsung_unlicensed/staging/device-partial.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2012 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.
-
-# Samsung blob(s) necessary for Manta hardware
-PRODUCT_PACKAGES := \
- fimc_is_fw \
- maxtouch \
- setfile \
- libbccArm.sha1.so \
- libbccArm.so \
- libbcinfoArm.so \
- libclcoreArm.bc \
- libclcore_neonArm.bc \
- libdrmdecrypt \
- libRSDriverArm.so \
- 00060308060501020000000000000000 \
- 020a0000000000000000000000000000 \
- 07060000000000000000000000000000
diff --git a/self-extractors/samsung_unlicensed/staging/proprietary/Android.mk b/self-extractors/samsung_unlicensed/staging/proprietary/Android.mk
deleted file mode 100644
index 24e39b7..0000000
--- a/self-extractors/samsung_unlicensed/staging/proprietary/Android.mk
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2012 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.
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),manta)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := fimc_is_fw
-LOCAL_SRC_FILES := fimc_is_fw.bin
-LOCAL_MODULE_SUFFIX := .bin
-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
-LOCAL_SRC_FILES := maxtouch.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 := setfile
-LOCAL_SRC_FILES := setfile.bin
-LOCAL_MODULE_SUFFIX := .bin
-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 := libbccArm.sha1
-LOCAL_SRC_FILES := libbccArm.sha1.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libbccArm
-LOCAL_SRC_FILES := libbccArm.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libbcinfoArm
-LOCAL_SRC_FILES := libbcinfoArm.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libclcoreArm
-LOCAL_SRC_FILES := libclcoreArm.bc
-LOCAL_MODULE_SUFFIX := .bc
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libclcore_neonArm
-LOCAL_SRC_FILES := libclcore_neonArm.bc
-LOCAL_MODULE_SUFFIX := .bc
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrmdecrypt
-LOCAL_SRC_FILES := libdrmdecrypt.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libRSDriverArm
-LOCAL_SRC_FILES := libRSDriverArm.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung_arm
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := 00060308060501020000000000000000
-LOCAL_SRC_FILES := 00060308060501020000000000000000.tlbin
-LOCAL_MODULE_SUFFIX := .tlbin
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := 020a0000000000000000000000000000
-LOCAL_SRC_FILES := 020a0000000000000000000000000000.drbin
-LOCAL_MODULE_SUFFIX := .drbin
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := 07060000000000000000000000000000
-LOCAL_SRC_FILES := 07060000000000000000000000000000.tlbin
-LOCAL_MODULE_SUFFIX := .tlbin
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/secapp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
-endif