Add a varition in common scripts to support sailfish blobs am: 6ff7343b64 am: ce8d3a16fd am: d49a18a17d
am: aec77c28f8
Change-Id: I4867af810064f40a1216d94895823d8511ad6ba3
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index fa6c20a..9525120 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -86,7 +86,7 @@
if test $(wc -l < $ARCHIVEDIR/$DEVICENAME-without.txt) != 0 -a $(wc -l < $ARCHIVEDIR/$DEVICENAME-with.txt) != 0
then
(
- echo '# Copyright (C) 2011 The Android Open Source Project'
+ date +"# Copyright (C) %Y The Android Open Source Project"
echo '#'
echo '# Licensed under the Apache License, Version 2.0 (the "License");'
echo '# you may not use this file except in compliance with the License.'
@@ -102,10 +102,8 @@
echo
echo '# This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT'
echo
- diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
- grep -v '\.odex$' |
- grep '>' |
- cut -b 3-
+ comm -13 $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
+ grep -v '\.odex$'
) > $ARCHIVEDIR/$DEVICENAME-proprietary-blobs.txt
cp $ARCHIVEDIR/$DEVICENAME-proprietary-blobs.txt device/$MANUFACTURERNAME/$DEVICENAME/proprietary-blobs.txt
diff --git a/generate-packages.sh b/generate-packages.sh
index cf025fe..d24f75e 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -129,6 +129,7 @@
echo \ \ Setting up $COMPANY-specific makefiles
cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles
echo \ \ Setting up shared makefiles
+ unzip -j -o $ZIP OTA/android-info.txt -d root > /dev/null || echo \ \ \ \ Error extracting OTA/android-info.txt
cp -R root/* ${FILEDIR_ROOT} || echo \ \ \ \ Error copying makefiles
if [[ ${ROOTDEVICE} == sailfish ]]
