diff options
| author | Xin Li <delphij@google.com> | 2018-07-19 13:49:57 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-07-19 13:49:57 -0700 |
| commit | a2fa7e34273aaaa4ccb4f70986771d78a1bdaaa4 (patch) | |
| tree | 26271fa530526e01f56a0526a5aea21653e4ad18 | |
| parent | d2989a2f79563deccecc14e94271c9661b4667cc (diff) | |
| parent | 3535aa9404e934042142cf27d76747a48f089e08 (diff) | |
| download | device_common-a2fa7e34273aaaa4ccb4f70986771d78a1bdaaa4.tar.gz device_common-a2fa7e34273aaaa4ccb4f70986771d78a1bdaaa4.tar.bz2 device_common-a2fa7e34273aaaa4ccb4f70986771d78a1bdaaa4.zip | |
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug: 111615259
Change-Id: I4f077688a9cd10aa350670be79b00b44488ba65b
| -rw-r--r-- | generate-factory-images-common.sh | 8 | ||||
| -rwxr-xr-x | generate-packages.sh | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index a2d81ca..fdcb442 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -101,8 +101,8 @@ cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. -if ! grep -q dtbo.sig \$(which fastboot); then - echo "fastboot too old" +if ! grep -q partition-exists \$(which fastboot); then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi EOF @@ -258,8 +258,8 @@ cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. -if ! grep -q dtbo.sig \$(which fastboot); then - echo "fastboot too old" +if ! grep -q partition-exists \$(which fastboot); then + echo "fastboot too old; please download the latest version at https://developer.android.com/studio/releases/platform-tools.html" exit 1 fi EOF diff --git a/generate-packages.sh b/generate-packages.sh index 5b18aa6..2f3e9c3 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) + dragon|marlin|sailfish|taimen|walleye|crosshatch|blueline) FILEDIR_ROOT=tmp/vendor/${MANUFACTURER}_devices/$ROOTDEVICE ;; hikey960) FILEDIR=tmp/vendor/linaro/$DEVICE/$COMPANY/proprietary @@ -166,6 +166,16 @@ do # Move device-vendor-walleye.mk under muskie directory so that it can be # inherited by device/google/muskie/aosp_walleye.mk mv ${FILEDIR_ROOT}/proprietary/device-vendor-walleye.mk ${FILEDIR_ROOT_SHARE} + elif [[ ${ROOTDEVICE} == blueline ]] + then + FILEDIR_ROOT_SHARE=tmp/vendor/${MANUFACTURER}_devices/crosshatch/proprietary + mkdir -p ${FILEDIR_ROOT_SHARE} + + # blueline shares BoardConfigVendor.mk with its neph' crosshatch + mv ${FILEDIR_ROOT}/proprietary/BoardConfigVendor.mk ${FILEDIR_ROOT_SHARE} + # 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} fi echo \ \ Generating self-extracting script |