summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-01-11 14:16:07 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-11 14:16:07 -0800
commit12e101970b7f575f816b0b44e2fe0434d0f0dbef (patch)
treea929dfd41833fa8ce098c203d6d2c626308c8f36
parent4714951fdaf461fc69e41bd7632fb4ea08d3b23f (diff)
parent54ec5949d61be37c9bd7c116eb3a84e61ecbfe5b (diff)
downloadcommon-12e101970b7f575f816b0b44e2fe0434d0f0dbef.tar.gz
Add B4S4 to the common scripts. am: 0b45b1e762
am: 54ec5949d6 Change-Id: I8e9f86bf58ad9b499a8ad586d592fdb94476d0cd
-rwxr-xr-xgenerate-packages.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/generate-packages.sh b/generate-packages.sh
index 2f3e9c3..1eb1677 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
@@ -176,6 +179,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