diff options
author | Bill Yi <byi@google.com> | 2016-09-22 19:28:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 19:28:26 +0000 |
commit | d49a18a17d624b41bcf79ad972ebfdb93f4c2045 (patch) | |
tree | 5a1769ffd40817d408402bfb9a8128608bf69034 | |
parent | 18bc401f584e1e3943e451458d9f91159c807f70 (diff) | |
parent | ce8d3a16fd31621ff1d6fd3af783dfecf62ed15f (diff) | |
download | common-nougat-mr2.2-release.tar.gz |
Add a varition in common scripts to support sailfish blobs am: 6ff7343b64android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev
am: ce8d3a16fd
Change-Id: If2f80623d0487663993d55434a58d0d51870ee5d
-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 |