Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Add a path variation for dragon device
Change-Id: Ibfcad02753e99fdade305abe99a91b3812b81948
diff --git a/generate-packages.sh b/generate-packages.sh
index 33b4254..c48d328 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -39,7 +39,13 @@
rm -rf tmp
FILEDIR=tmp/vendor/$COMPANY/$DEVICE/proprietary
mkdir -p $FILEDIR
- mkdir -p tmp/vendor/$MANUFACTURER/$ROOTDEVICE
+ FILEDIR_ROOT=tmp/vendor/$MANUFACTURER/$ROOTDEVICE
+
+ if test ${ROOTDEVICE} = "dragon"
+ then
+ FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE
+ fi
+ mkdir -p ${FILEDIR_ROOT}
TO_EXTRACT=`sed -n -e '/'" $COMPANY"'/,/;;/ p' $EXTRACT_LIST_FILENAME | tail -n+3 | head -n-2 | sed -e 's/\\\//g'`
@@ -121,7 +127,7 @@
echo \ \ Setting up $COMPANY-specific makefiles
cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles
echo \ \ Setting up shared makefiles
- cp -R root/* tmp/vendor/$MANUFACTURER/$ROOTDEVICE || echo \ \ \ \ Error copying makefiles
+ cp -R root/* ${FILEDIR_ROOT} || echo \ \ \ \ Error copying makefiles
echo \ \ Generating self-extracting script
SCRIPT=extract-$COMPANY-$DEVICE.sh
cat PROLOGUE > tmp/$SCRIPT || echo \ \ \ \ Error generating script