diff options
author | Bill Yi <byi@google.com> | 2020-03-05 09:51:00 -0800 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2020-03-05 09:51:00 -0800 |
commit | ff36fc3eecf38da6f8e2a7dc47d72f2963745363 (patch) | |
tree | 8055681dc0e35f5e89b47631faa7e4c6407110cf | |
parent | 8084e9711649b653af49de5b89f426c2c4ae4532 (diff) | |
parent | 094f2d5ba97f707ce66f7e85205760f01f9619db (diff) | |
download | taimen-ff36fc3eecf38da6f8e2a7dc47d72f2963745363.tar.gz |
Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2
Change-Id: I28e1dbf7cb2ad1d23b307fcf6ca7a4ed6b651941
-rw-r--r-- | self-extractors/extract-lists.txt | 2 | ||||
-rw-r--r-- | self-extractors/google_devices/staging/Android.mk | 22 | ||||
-rw-r--r-- | self-extractors/qcom/staging/BoardConfigPartial.mk | 2 |
3 files changed, 26 insertions, 0 deletions
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..21236c0 --- /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 taimen,$(TARGET_DEVICE)),) + $(call add-radio-file,bootloader.img) + $(call add-radio-file,radio.img) +endif diff --git a/self-extractors/qcom/staging/BoardConfigPartial.mk b/self-extractors/qcom/staging/BoardConfigPartial.mk index fd9a87c..326728b 100644 --- a/self-extractors/qcom/staging/BoardConfigPartial.mk +++ b/self-extractors/qcom/staging/BoardConfigPartial.mk @@ -11,3 +11,5 @@ # 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. + +VENDOR_BLOBS_LICENSE := vendor/qcom/taimen/LICENSE |