diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:07:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:07:56 +0000 |
| commit | 0765164ad7e409c27eb5066da44351b8cd1515db (patch) | |
| tree | 306185886e403e74dd0c58b510109152ce820966 | |
| parent | 9d2a0d0c3aab8b698669bad9810bc52ac7f76dfb (diff) | |
| parent | 86679dc4aa80cedcbda853103637d92240cd9310 (diff) | |
| download | common-android10-qpr1-c-s1-release.tar.gz | |
Snap for 5645193 from 86679dc4aa80cedcbda853103637d92240cd9310 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: Ia768957079b2caa294e3492d330d7c5b35dc3a68
| -rwxr-xr-x | generate-packages.sh | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index d3b1ff4..fb72dd4 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -42,12 +42,11 @@ do FILEDIR_ROOT=tmp/vendor/$MANUFACTURER/$ROOTDEVICE case ${ROOTDEVICE} in - dragon|marlin|sailfish|taimen|walleye|crosshatch|blueline|bonito|sargo) - FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE ;; hikey960) FILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY/proprietary MAKEFILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY ;; - *) ;; + *) + FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE ;; esac mkdir -p ${FILEDIR} @@ -142,19 +141,24 @@ do # Move device-vendor-sargo.mk under bonito directory so that it can # be inherited by device/google/bonito/aosp_sargo.mk mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE} + elif [[ ${ROOTDEVICE} == flame ]] + then + FILEDIR_ROOT_SHARE=tmp/vendor/${MANUFACTURER}_devices/coral/proprietary + mkdir -p ${FILEDIR_ROOT_SHARE} + + # flame shares BoardConfigVendor.mk with its sis-in-law' coral + mv ${FILEDIR_ROOT}/proprietary/BoardConfigVendor.mk ${FILEDIR_ROOT_SHARE} + # Move device-vendor-flame.mk under coral directory so that it can + # be inherited by device/google/coral/aosp_flame.mk + mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE} fi if [[ ${COMPANY} == qcom ]] then - case ${ROOTDEVICE} in - marlin|sailfish|taimen|walleye|crosshatch|blueline|bonito|sargo) - if [[ -e "${MAKEFILEDIR}/Android.mk" ]] - then - mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/ - fi - ;; - *) ;; - esac + if [[ -e "${MAKEFILEDIR}/Android.mk" ]] + then + mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/ + fi fi echo \ \ Generating self-extracting script |