diff options
author | SzuWei Lin <szuweilin@google.com> | 2022-04-28 05:46:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-28 05:46:02 +0000 |
commit | 5353689521d8281e038a3a1dbc8bf10e0a86b3bb (patch) | |
tree | c298bd61343d7396799ae4a9926ec7f6d58001d0 | |
parent | 1b2e388eae24eb123442405a904910328c2cae3d (diff) | |
parent | 2b6377fc97d1c033bb2c58f7d9324c5be0c1e953 (diff) | |
download | common-android13-d4-release.tar.gz |
Unfold the result of output-kernel am: 239b3e9cda am: 2b6377fc97android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17937983
Change-Id: I6b5456ef8dee7584a5479cf42cca482c74725a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | gki_arm64.mk | 36 | ||||
-rw-r--r-- | gki_common.mk | 68 | ||||
-rw-r--r-- | gki_x86_64.mk | 20 |
3 files changed, 51 insertions, 73 deletions
diff --git a/gki_arm64.mk b/gki_arm64.mk index ede3001..3ff21cd 100644 --- a/gki_arm64.mk +++ b/gki_arm64.mk @@ -24,9 +24,39 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) # Build GKI boot images # include device/generic/common/gki_common.mk -$(call output-kernel,kernel/prebuilts/4.19/arm64,kernel/4.19) -$(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10) -$(call output-kernel,kernel/prebuilts/5.15/arm64,kernel/5.15) + +PRODUCT_COPY_FILES += \ + kernel/prebuilts/4.19/arm64/kernel-4.19:kernel-4.19 \ + kernel/prebuilts/4.19/arm64/kernel-4.19-gz:kernel-4.19-gz \ + kernel/prebuilts/4.19/arm64/kernel-4.19-lz4:kernel-4.19-lz4 \ + kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10 \ + kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz \ + kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-lz4 \ + kernel/prebuilts/5.15/arm64/kernel-5.15:kernel-5.15 \ + kernel/prebuilts/5.15/arm64/kernel-5.15-gz:kernel-5.15-gz \ + kernel/prebuilts/5.15/arm64/kernel-5.15-lz4:kernel-5.15-lz4 \ + +$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt) + +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + kernel/prebuilts/4.19/arm64/kernel-4.19-allsyms:kernel-4.19-allsyms \ + kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \ + kernel/prebuilts/4.19/arm64/kernel-4.19-lz4-allsyms:kernel-4.19-lz4-allsyms \ + kernel/prebuilts/5.10/arm64/kernel-5.10-allsyms:kernel-5.10-allsyms \ + kernel/prebuilts/5.10/arm64/kernel-5.10-gz-allsyms:kernel-5.10-gz-allsyms \ + kernel/prebuilts/5.10/arm64/kernel-5.10-lz4-allsyms:kernel-5.10-lz4-allsyms \ + kernel/prebuilts/5.15/arm64/kernel-5.15-allsyms:kernel-5.15-allsyms \ + kernel/prebuilts/5.15/arm64/kernel-5.15-gz-allsyms:kernel-5.15-gz-allsyms \ + kernel/prebuilts/5.15/arm64/kernel-5.15-lz4-allsyms:kernel-5.15-lz4-allsyms \ + +$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19-debug/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt) + +endif PRODUCT_NAME := gki_arm64 diff --git a/gki_common.mk b/gki_common.mk index 1d301c0..42b9a6c 100644 --- a/gki_common.mk +++ b/gki_common.mk @@ -14,74 +14,6 @@ # limitations under the License. # -# The files will be copy from the source folder to the dist folder -_output-kernel-info-files := \ - prebuilt-info.txt \ - manifest.xml \ - - -# Copy the files from the source folder to the dist folder -# -# Skip if the file is not existing. -# -# $(1): file list -# $(2): the source folder -# $(3): the dist folder -define _output_kernel_files -$(foreach f,$(1), \ - $(if $(wildcard $(2)/$(f)), \ - $(call dist-for-goals,dist_files,$(2)/$(f):$(3)/$(f)))) -endef - - -# Output the release kernel prebuilt files to dist folder -# -# $(1): the source folder contains the kernel prebuilt files -# -# Notes: -# For mainline kernel, it outputs -allsyms kernel as release kernel. -# -define _output-kernel-user -$(if $(findstring mainline,$(1)), \ - $(eval PRODUCT_COPY_FILES += \ - $(foreach f,$(wildcard $(1)/kernel-*-allsyms), \ - $(f):$(subst -allsyms,,$(notdir $(f))))), \ - $(eval PRODUCT_COPY_FILES += \ - $(call copy-files,$(filter-out *-allsyms,$(wildcard $(1)/kernel-*)),.))) -endef - - -# Output the debug kernel prebuilt files to dist folder -# -# $(1): the source folder contains the kernel prebuilt files -# -# Note: -# For mainline kernel, it outputs -allsyms kernel as release kernel, -# so there is no need to output -allsyms again. -# -define _output-kernel-debug -$(if $(findstring mainline,$(1)),, \ - $(eval PRODUCT_COPY_FILES += \ - $(call copy-files,$(wildcard $(1)/kernel-*-allsyms),.))) -endef - - -# Output the kernel prebuilt files to dist folder -# -# $(1): the source folder contains the kernel prebuilt files -# $(2): the dist folder -# -# Example: -# $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10) -# -define output-kernel -$(call _output-kernel-user,$(1)) -$(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2)) -$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)), \ - $(call _output-kernel-debug,$(1)) \ - $(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2)-debug)) -endef - # # Output boot.img # diff --git a/gki_x86_64.mk b/gki_x86_64.mk index 75f5ff7..2dc7919 100644 --- a/gki_x86_64.mk +++ b/gki_x86_64.mk @@ -24,8 +24,24 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) # Build GKI boot images # include device/generic/common/gki_common.mk -$(call output-kernel,kernel/prebuilts/5.10/x86_64,kernel/5.10) -$(call output-kernel,kernel/prebuilts/5.15/x86_64,kernel/5.15) + +PRODUCT_COPY_FILES += \ + kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10 \ + kernel/prebuilts/5.15/x86_64/kernel-5.15:kernel-5.15 \ + +$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt) + +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) + +PRODUCT_COPY_FILES += \ + kernel/prebuilts/5.10/x86_64/kernel-5.10-allsyms:kernel-5.10-allsyms \ + kernel/prebuilts/5.15/x86_64/kernel-5.15-allsyms:kernel-5.15-allsyms \ + +$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt) +$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt) + +endif PRODUCT_NAME := gki_x86_64 |