diff options
| author | Bill Yi <byi@google.com> | 2016-09-22 21:54:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 21:54:31 +0000 |
| commit | 699af187e87bab62db3e8c5189a7fb407da4a0eb (patch) | |
| tree | 361cbac557fd76c908a498d5d1b4bd62db3ed3d2 | |
| parent | 03aaed0fbb78f69fce0e096836c96fe578a4e3f4 (diff) | |
| parent | aec77c28f81468d42289c2b0620e8f2dca63141a (diff) | |
| download | device_common-security-oc-release.tar.gz device_common-security-oc-release.tar.bz2 device_common-security-oc-release.zip | |
Add a varition in common scripts to support sailfish blobs am: 6ff7343b64 am: ce8d3a16fd am: d49a18a17dandroid-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
am: aec77c28f8
Change-Id: I4867af810064f40a1216d94895823d8511ad6ba3
| -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 5c5d7e8..d24f75e 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -131,6 +131,19 @@ do 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 + + 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 |