Update grouper self-extractors for JOB32B
Change-Id: I7dcf37830d85ad7addd4d86262c938df81fa5c8b
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 292c5e1..511d4db 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -27,12 +27,20 @@
# 463694 = JZO54G
# 485486 = JZO54K
# end jb-dev
-BRANCH=jb-dev
+# start jb-mr1-dev
+# 521994 = JOP32B
+# end jb-mr1-dev
+BRANCH=jb-mr1-dev
if test $BRANCH=jb-dev
then
ZIP=nakasi-ota-485486.zip
BUILD=jzo54k
fi # jb-dev
+if test $BRANCH=jb-mr1-dev
+then
+ ZIP=nakasi-ota-521994.zip
+ BUILD=jop32b
+fi # jb-mr1-dev
ROOTDEVICE=grouper
DEVICE=grouper
MANUFACTURER=asus
@@ -144,6 +152,7 @@
trusted_logic)
TO_EXTRACT="\
system/bin/tf_daemon \
+ system/lib/hw/keystore.grouper.so \
"
;;
widevine)
diff --git a/self-extractors/trusted_logic/staging/device-partial.mk b/self-extractors/trusted_logic/staging/device-partial.mk
index 3c5b63b..80f8910 100644
--- a/self-extractors/trusted_logic/staging/device-partial.mk
+++ b/self-extractors/trusted_logic/staging/device-partial.mk
@@ -14,4 +14,5 @@
# Trusted Logic blob(s) necessary for Grouper hardware
PRODUCT_PACKAGES := \
- tf_daemon
+ tf_daemon \
+ keystore.grouper
diff --git a/self-extractors/trusted_logic/staging/proprietary/Android.mk b/self-extractors/trusted_logic/staging/proprietary/Android.mk
index c76fed1..055849e 100644
--- a/self-extractors/trusted_logic/staging/proprietary/Android.mk
+++ b/self-extractors/trusted_logic/staging/proprietary/Android.mk
@@ -25,4 +25,14 @@
LOCAL_MODULE_OWNER := trusted_logic
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := keystore.grouper
+LOCAL_SRC_FILES := keystore.grouper.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := trusted_logic
+include $(BUILD_PREBUILT)
+
endif
