From 69d65201b9ca05d47312fc73ea87886368591e5b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 4 Nov 2019 15:40:54 -0800
Subject: [PATCH] Add bootloader and radio images to the vendor blobs packages

BUG:143903156
Change-Id: I12650326505a8307699bf689585f1e7e601ac8b6
---
 self-extractors/extract-lists.txt             |  2 ++
 .../google_devices/staging/Android.mk         | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 self-extractors/google_devices/staging/Android.mk

diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index a4bf07f..b5c8272 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,6 +1,8 @@
   google_devices)
     TO_EXTRACT="\
             IMAGES/vendor.img \
+            RADIO/bootloader.img \
+            RADIO/radio.img \
             "
     ;;
   qcom)
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
new file mode 100644
index 0000000..425981d
--- /dev/null
+++ b/self-extractors/google_devices/staging/Android.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2019 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter muskie walleye,$(TARGET_DEVICE)),)
+  $(call add-radio-file,bootloader.img)
+  $(call add-radio-file,radio.img)
+endif