From 15b554b16583a199f878487a2542658d518e0067 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 4 Nov 2019 15:41:07 -0800 Subject: [PATCH 1/4] Add bootloader and radio images to the vendor blobs packages BUG:143903156 Change-Id: I6466f959f9ac6953acc4c2a72a9439edb7dc6692 --- 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..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 From 58b61194e703f775d35107c411c1d4a8e39c14de Mon Sep 17 00:00:00 2001 From: Ian Kasprzak Date: Mon, 11 Nov 2019 12:56:38 -0800 Subject: [PATCH 2/4] Add VENDOR_BLOBS_NOTICE to BoardConfigPartial. Bug: 125451157 Bug: 144190530 Test: Presubmit Change-Id: Ia633f2316794ffbb05bd876a703611fb7df2c37d (cherry picked from commit f7434260889d8a90c15c9903a93141801ecaf4c2) --- self-extractors/google_devices/staging/BoardConfigPartial.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk index 5f4f882..1115d85 100644 --- a/self-extractors/google_devices/staging/BoardConfigPartial.mk +++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk @@ -14,6 +14,8 @@ BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/taimen/proprietary/vendor.img +VENDOR_BLOBS_NOTICE := vendor/google_devices/taimen/NOTICE + -include vendor/google/tools/android-info.mk ifdef USE_ANDROID_INFO TARGET_BOARD_INFO_FILE := vendor/google_devices/taimen/android-info.txt From bc09a1b2e67c8861fddf5fb01fb3616fb19c1f64 Mon Sep 17 00:00:00 2001 From: Ian Kasprzak Date: Tue, 12 Nov 2019 19:25:37 -0800 Subject: [PATCH 3/4] Update license location to qcom blobs. Switch from VENDOR_BLOBS_NOTICE to VENDOR_BLOBS_LICENSE. Bug: 125451157 Bug: 144190530 Test: presubmit Change-Id: Ia379203bc0d179fef8bf5f139a7411d89d9db952 --- self-extractors/google_devices/staging/BoardConfigPartial.mk | 2 -- self-extractors/qcom/staging/BoardConfigPartial.mk | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk index 1115d85..5f4f882 100644 --- a/self-extractors/google_devices/staging/BoardConfigPartial.mk +++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk @@ -14,8 +14,6 @@ BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/taimen/proprietary/vendor.img -VENDOR_BLOBS_NOTICE := vendor/google_devices/taimen/NOTICE - -include vendor/google/tools/android-info.mk ifdef USE_ANDROID_INFO TARGET_BOARD_INFO_FILE := vendor/google_devices/taimen/android-info.txt 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 From e22c8b3af71608daa66bed4f969cc6129b3cd68d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 6 Feb 2020 19:02:28 +0900 Subject: [PATCH 4/4] Move VNDK APEX to vendor partition ... for aosp_* targets so that we don't need to update vendor.img everytime there is a change in the VNDK libraries Bug: 140136207 Test: m Change-Id: Ic7ffaa9503902884f219400cf93516a6fbf8b210 (cherry picked from commit 1d97f7055550d375aa7f371e148c3ec9aff0bd29) (cherry picked from commit cdd222f7bfb354038dba2c6a1100af626aace638) --- aosp_taimen.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index 5653fd5..ced8b52 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -35,6 +35,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_RESTRICT_VENDOR_FILES := owner +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor + PRODUCT_MANUFACTURER := Google PRODUCT_BRAND := Android PRODUCT_NAME := aosp_taimen