summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2017-04-25 20:46:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-25 20:46:09 +0000
commit27de578142521e0bef6b64d64c39a309041a94c8 (patch)
treecccfb9372112418e0c0e955b47945fad7a4a2951
parentaec77c28f81468d42289c2b0620e8f2dca63141a (diff)
parent81fa95978b5542b9d2851b04d034b9a75ed8b43b (diff)
downloaddevice_common-27de578142521e0bef6b64d64c39a309041a94c8.tar.gz
device_common-27de578142521e0bef6b64d64c39a309041a94c8.tar.bz2
device_common-27de578142521e0bef6b64d64c39a309041a94c8.zip
Merge "Add a variation in generate-package for future devboards"
am: 81fa95978b Change-Id: Ic2969126b9b77f7a39609fd15a4c0ea45439851e
-rwxr-xr-xgenerate-packages.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/generate-packages.sh b/generate-packages.sh
index cf025fe..2579145 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -38,15 +38,19 @@ do
echo Processing files from $COMPANY
rm -rf tmp
FILEDIR=tmp/vendor/$COMPANY/$DEVICE/proprietary
- mkdir -p $FILEDIR
+ MAKEFILEDIR=tmp/vendor/$COMPANY/$DEVICE/
FILEDIR_ROOT=tmp/vendor/$MANUFACTURER/$ROOTDEVICE
case ${ROOTDEVICE} in
dragon|marlin|sailfish)
FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE ;;
+ hikey960)
+ FILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY/proprietary
+ MAKEFILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY ;;
*) ;;
esac
+ mkdir -p ${FILEDIR}
mkdir -p ${FILEDIR_ROOT}
TO_EXTRACT=`sed -n -e '/'" $COMPANY"'/,/;;/ p' $EXTRACT_LIST_FILENAME | tail -n+3 | head -n-2 | sed -e 's/\\\//g'`
@@ -127,7 +131,7 @@ do
done
echo \ \ Setting up $COMPANY-specific makefiles
- cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles
+ cp -R $COMPANY/staging/* $MAKEFILEDIR || echo \ \ \ \ Error copying makefiles
echo \ \ Setting up shared makefiles
cp -R root/* ${FILEDIR_ROOT} || echo \ \ \ \ Error copying makefiles