diff options
| author | Xin Li <delphij@google.com> | 2020-01-15 15:56:54 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-01-15 15:56:54 -0800 |
| commit | cd68dc87fd72ef97fe4f80eb26f8ab63b5e991b1 (patch) | |
| tree | 114ae16759111a37ed5c1422923fb63ea12c582a | |
| parent | b9353b397c37d207dde78afabcf5827bc2473368 (diff) | |
| parent | 7c6287f0329217e97a8d5711ee46e6b1cd18dfb3 (diff) | |
| download | taimen-cd68dc87fd72ef97fe4f80eb26f8ab63b5e991b1.tar.gz | |
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I04ac8349cd6b94145b89f5a7d94a2af2d2775dce
| -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 |