diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2017-04-25 20:51:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-25 20:51:14 +0000 |
| commit | 1401af3a0c8e9cf74f70bbdcae9299be30866563 (patch) | |
| tree | b06dd8b4a515ffa4962c0cf9eae3ffe43db4911b | |
| parent | 0c9efb20d53753e1e548de6fb10f96689742f430 (diff) | |
| parent | f20027396e506ef88b804add9fc5f0e1455448c1 (diff) | |
| download | device_common-1401af3a0c8e9cf74f70bbdcae9299be30866563.tar.gz device_common-1401af3a0c8e9cf74f70bbdcae9299be30866563.tar.bz2 device_common-1401af3a0c8e9cf74f70bbdcae9299be30866563.zip | |
Merge "Add a variation in generate-package for future devboards" am: 81fa95978b am: 27de578142android-o-mr1-preview-2android-o-mr1-preview-1
am: f20027396e
Change-Id: I405136721526424646aeb880a41be0bf457df093
| -rwxr-xr-x | generate-packages.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index d24f75e..fcd5206 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 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 |