summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2016-09-22 19:28:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 19:28:26 +0000
commitd49a18a17d624b41bcf79ad972ebfdb93f4c2045 (patch)
tree5a1769ffd40817d408402bfb9a8128608bf69034
parent18bc401f584e1e3943e451458d9f91159c807f70 (diff)
parentce8d3a16fd31621ff1d6fd3af783dfecf62ed15f (diff)
downloadcommon-nougat-mr2.2-release.tar.gz
am: ce8d3a16fd Change-Id: If2f80623d0487663993d55434a58d0d51870ee5d
-rwxr-xr-xgenerate-packages.sh13
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