diff options
| author | Xin Li <delphij@google.com> | 2019-02-21 09:24:29 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-02-21 09:24:29 -0800 |
| commit | 5325d6e50abf5e3390adfbbb7ff5a9c94e38cb2d (patch) | |
| tree | cc2ffebf89b10cdc5449ad9881374f159382284a | |
| parent | f8e99ae2c39140dd06ce7769f9a74030bc3ca480 (diff) | |
| parent | 54ec5949d61be37c9bd7c116eb3a84e61ecbfe5b (diff) | |
| download | common-temp_b_131756210_stage-aosp-master.tar.gz | |
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-mastertemp_b_131756210_stage-aosp-master
Bug: 120848293
Change-Id: I22e5c84c3d8061a6f6dda2180d219a35532b2cf9
| -rwxr-xr-x | generate-packages.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index c70ab37..5d55c33 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -42,7 +42,7 @@ do FILEDIR_ROOT=tmp/vendor/$MANUFACTURER/$ROOTDEVICE case ${ROOTDEVICE} in - dragon|marlin|sailfish|taimen|walleye|crosshatch|blueline) + dragon|marlin|sailfish|taimen|walleye|crosshatch|blueline|bonito|sargo) FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE ;; hikey960) FILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY/proprietary @@ -74,6 +74,9 @@ do if [[ $ONE_FILE == */lib64/* ]] then FILEDIR_NEW=$FILEDIR/lib64 + elif [[ $ONE_FILE == */arm64/* ]] + then + FILEDIR_NEW=$FILEDIR/arm64 elif [[ $ONE_FILE == */arm/nb/* ]] then FILEDIR_NEW=$FILEDIR/armnb @@ -167,6 +170,16 @@ do # Move device-vendor-blueline.mk under crosshatch directory so that it can # be inherited by device/google/crosshatch/aosp_blueline.mk mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE} + elif [[ ${ROOTDEVICE} == sargo ]] + then + FILEDIR_ROOT_SHARE=tmp/vendor/${MANUFACTURER}_devices/bonito/proprietary + mkdir -p ${FILEDIR_ROOT_SHARE} + + # sargo shares BoardConfigVendor.mk with its bro-in-law' bonito + mv ${FILEDIR_ROOT}/proprietary/BoardConfigVendor.mk ${FILEDIR_ROOT_SHARE} + # 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} fi echo \ \ Generating self-extracting script |