diff options
| author | Bill Yi <byi@google.com> | 2016-09-22 20:08:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 20:08:36 +0000 |
| commit | aec77c28f81468d42289c2b0620e8f2dca63141a (patch) | |
| tree | 5a1769ffd40817d408402bfb9a8128608bf69034 | |
| parent | 167452afad3553090e3980323737c5e74d606803 (diff) | |
| parent | d49a18a17d624b41bcf79ad972ebfdb93f4c2045 (diff) | |
| download | device_common-aec77c28f81468d42289c2b0620e8f2dca63141a.tar.gz device_common-aec77c28f81468d42289c2b0620e8f2dca63141a.tar.bz2 device_common-aec77c28f81468d42289c2b0620e8f2dca63141a.zip | |
Add a varition in common scripts to support sailfish blobs am: 6ff7343b64 am: ce8d3a16fdandroid-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
am: d49a18a17d
Change-Id: Ib5ece132ca3e5c5c44af8d68ac8c35566169575c
| -rwxr-xr-x | generate-packages.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index 6bb503f..cf025fe 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -130,6 +130,19 @@ do cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles echo \ \ Setting up shared makefiles cp -R root/* ${FILEDIR_ROOT} || echo \ \ \ \ Error copying makefiles + + if [[ ${ROOTDEVICE} == sailfish ]] + then + FILEDIR_ROOT_SHARE=tmp/vendor/${MANUFACTURER}_devices/marlin + mkdir -p ${FILEDIR_ROOT_SHARE} + + # sailfish shares BoardConfigVendor.mk with its bro' marlin + mv ${FILEDIR_ROOT}/BoardConfigVendor.mk ${FILEDIR_ROOT_SHARE} + # Move device-vendor-sailfish.mk under marlin directory so that it can be + # inherited by device/google/marlin/aosp_sailfish.mk + mv ${FILEDIR_ROOT}/device-vendor-sailfish.mk ${FILEDIR_ROOT_SHARE} + fi + echo \ \ Generating self-extracting script SCRIPT=extract-$COMPANY-$DEVICE.sh cat PROLOGUE > tmp/$SCRIPT || echo \ \ \ \ Error generating script |