From 728bc331813e0931ed1c1394229fad9ded00e76f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 9 Jul 2018 11:08:53 -0700
Subject: Add B1C1 to the common scripts.

B1C1 has similar design structure with M/S

TEST:Generated blobs. Make. Flashed devices

BUG:79531050
Change-Id: I090d9c2f1c3b0de29c71e452b81ddca548f7d48c
---
 generate-packages.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 20e35d3569a0646dceb105ccc66524d969887759 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Thu, 29 Mar 2018 15:33:27 -0700
Subject: Refuse to flash if fastboot have no knowledge about partition-exists.

Bug: 77290928
Change-Id: Ib4811e75b5a798a10a4b107f7643a964c268d8f1
---
 generate-factory-images-common.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 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
-- 
cgit v1.2.3