aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-28Unfold the result of output-kernel am: 239b3e9cdaaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseaml_tz4_332714010SzuWei Lin
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17937983 Change-Id: I01cab7df82cdae81e166e46a6ddc32aa14782a1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25Unfold the result of output-kernelt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devSzuWei Lin
The number of file kernel versions and output files are not reduced. We don't need output-kernel now. Bug: 230047219 Test: TH with gki_arm64 and gki_x86_64 Change-Id: I7d74595dce9e398990ea08ed805ce0bb81df7f97 (cherry picked from commit ceb6b290af57b33217128c93325303a84ec77c64)
2022-04-20Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 ↵Treehugger Robot
am: 78b7d28908 am: c44d96b20d Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Ib528f9c9ad3223f40bf461586b4944fe308a9eaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 ↵Treehugger Robot
am: 78b7d28908 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Idca87c1090bab3a90fd539dfa6333724a9743a9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Ib91e9f91f82de7035c43e5c71192f49564a361be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Iede589f951f0b1f5f3e104d6b1ff8e415e35d966 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE"Treehugger Robot
2022-04-19Removing BOARD_BUILD_SYSTEM_ROOT_IMAGEBowgo Tsai
BOARD_BUILD_SYSTEM_ROOT_IMAGE is deprecated, so using another new flag: BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK, to exclude the ramdisk from GKI boot images. Bug: 220834917 Test: build and `unpack_bootimg` Change-Id: Ia207f2ffbbefa55884e533260440edef7dc4f770
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0f71a41083 -s ours ↵Xin Li
am: aab6924c82 -s ours am: f4ff6b754d -s ours am skip reason: Merged-In If209f5e5821393769b1b6f1d12b1aa4599d33abc with SHA-1 70a9dc84a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17544711 Change-Id: Ifb330741e2832ebfbbfc660bfbe343d7e9c47af9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0f71a41083 -s ours ↵Xin Li
am: aab6924c82 -s ours am skip reason: Merged-In If209f5e5821393769b1b6f1d12b1aa4599d33abc with SHA-1 70a9dc84a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17544711 Change-Id: I714cd15912320b484d0af28907cdbca0d390ad5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0f71a41083 -s oursXin Li
am skip reason: Merged-In If209f5e5821393769b1b6f1d12b1aa4599d33abc with SHA-1 70a9dc84a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17544711 Change-Id: Ie7c5e586d4e5be35242d3b45a509d18bbb63e268 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: If209f5e5821393769b1b6f1d12b1aa4599d33abc Change-Id: Ic853531e1a31f8beef609b80f484506add3d66d4
2022-03-29Merge "Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag." ↵Treehugger Robot
am: c32d31d4fa am: 9e108ef038 am: 70a9dc84a1 am: e39026b500 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2039603 Change-Id: Ie87cc2eafbf68334402627c3d18570f3f141cc1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Merge "Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag." ↵Treehugger Robot
am: c32d31d4fa am: 9e108ef038 am: 70a9dc84a1 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2039603 Change-Id: I68837644dde0ea4d84599690e27cf2e806e6f7ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Merge "Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag." ↵Treehugger Robot
am: c32d31d4fa am: 9e108ef038 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2039603 Change-Id: If209f5e5821393769b1b6f1d12b1aa4599d33abc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Merge "Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag." ↵Treehugger Robot
am: c32d31d4fa Original change: https://android-review.googlesource.com/c/device/generic/common/+/2039603 Change-Id: I209eb5009d5af0bb4530f8dfecd59a497c6a102b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28Merge "Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag."Treehugger Robot
2022-03-23Allow BOARD_BUILD_SYSTEM_ROOT_IMAGE override by command line flag.Daniel Norman
This allows users to optionally include ramdisk in their GKI build until they have swapped to using the init-boot partition. Bug: 224481030 Change-Id: I6fb6a474763261f0963ea6358717cefb645d8690
2022-03-16Merge "Remove GKI from gsi_$arch" am: ed4305638b am: 5bca6ff26c am: ↵Treehugger Robot
0efdd62d95 am: a5f5747953 Original change: https://android-review.googlesource.com/c/device/generic/common/+/1936179 Change-Id: Ia0e466ed8f1e8ceb5115b645c159a19ec86bb386
2022-03-16Merge "Remove GKI from gsi_$arch" am: ed4305638b am: 5bca6ff26c am: 0efdd62d95Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1936179 Change-Id: I0d3278b107cf9bcc7fad22d3025b4a8ceea35c16
2022-03-16Merge "Remove GKI from gsi_$arch" am: ed4305638b am: 5bca6ff26cTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1936179 Change-Id: Ib23fa4fb0d847637d13fbb2e47935ca91e233d08
2022-03-16Merge "Remove GKI from gsi_$arch" am: ed4305638bTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1936179 Change-Id: I0e78a01df832cc57f2de8372bbf8a9dc7a082284
2022-03-16Merge "Remove GKI from gsi_$arch"Treehugger Robot
2022-03-14Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder" am: ↵Treehugger Robot
eec923d0ed am: c872455d1d am: 651889db87 am: 1c48752c40 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2020596 Change-Id: I8071e2b15a6809b17a3b878271dd009802c4694d
2022-03-14Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder" am: ↵Treehugger Robot
eec923d0ed am: c872455d1d am: 651889db87 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2020596 Change-Id: I26c2d3e52b77ffdebbe9a2a2e78c3869273fbd16
2022-03-14Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder" am: ↵Treehugger Robot
eec923d0ed am: c872455d1d Original change: https://android-review.googlesource.com/c/device/generic/common/+/2020596 Change-Id: Id1103ee0668e1ce464cefd5d3cd72573ee0691ef
2022-03-14Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder" am: ↵Treehugger Robot
eec923d0ed Original change: https://android-review.googlesource.com/c/device/generic/common/+/2020596 Change-Id: I79005d73fd1f0bf7a25df94a28535da447c7d365
2022-03-14Merge "Output debug kernel prebuilt files to dist kernel/*-debug folder"Treehugger Robot
2022-03-14Output debug kernel prebuilt files to dist kernel/*-debug folderSzuWei Lin
Bug: 212486689 Test: lunch gki_arm64-userdebug; make -j dist; check out/dist Change-Id: Ib6e7f395cad54b7ee94ec42ce281e4d343d3f1cc
2022-02-23Merge "Excluding the ramdisk from GKI boot images" am: ba85f96e35 am: ↵Bowgo Tsai
b5e8b17872 am: a29883d022 am: d38d4cad22 Original change: https://android-review.googlesource.com/c/device/generic/common/+/1994910 Change-Id: Id0adb2b589233fb141bb003c1a92ce961b93c65c
2022-02-23Merge "Excluding the ramdisk from GKI boot images" am: ba85f96e35 am: ↵Bowgo Tsai
b5e8b17872 am: a29883d022 Original change: https://android-review.googlesource.com/c/device/generic/common/+/1994910 Change-Id: I731863d182c44b0a1699205375aeff181683306f
2022-02-23Merge "Excluding the ramdisk from GKI boot images" am: ba85f96e35 am: b5e8b17872Bowgo Tsai
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1994910 Change-Id: I6de86ef87716a959d617ba59a52785b89ad8fb5d
2022-02-23Merge "Excluding the ramdisk from GKI boot images" am: ba85f96e35Bowgo Tsai
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1994910 Change-Id: I2d3721ca8b2906368b90b25c2aa9efd53545d789
2022-02-23Merge "Excluding the ramdisk from GKI boot images"Bowgo Tsai
2022-02-22Excluding the ramdisk from GKI boot imagesBowgo Tsai
By default, the build system assumes the ramdisk is either in the boot.img or in the init_boot.img. In gki_arm64, we've removed init_boot.img so the ramdisk will be included in the boot.img. However, GKI boot images should not include a ramdisk. Sets BOARD_BUILD_SYSTEM_ROOT_IMAGE to true to exclude the ramdisk. Bug: 220834917 Test: lunch gki_arm64-user; make -j dist; then unpack_bootimg boot-*.img Change-Id: I441592c141d6cfdb19a13c98cfca9a976af12604
2022-02-21Merge "Remove init_boot.img from gki_$arch" am: 6bf3a0aec4 am: 4627d8b7e1 ↵Treehugger Robot
am: 8556dbddd1 am: 862e57c3bf Original change: https://android-review.googlesource.com/c/device/generic/common/+/1992891 Change-Id: I011b992ab61d03c78f6f4a51f756c777a5754227
2022-02-21Merge "Remove init_boot.img from gki_$arch" am: 6bf3a0aec4 am: 4627d8b7e1 ↵Treehugger Robot
am: 8556dbddd1 Original change: https://android-review.googlesource.com/c/device/generic/common/+/1992891 Change-Id: Ifbc629af7f94e62426d65d0a70829047147c553b
2022-02-21Merge "Remove init_boot.img from gki_$arch" am: 6bf3a0aec4 am: 4627d8b7e1Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1992891 Change-Id: I4a67f44b3f7d79c0bd80837b1196cf2ca6781cee
2022-02-21Merge "Remove init_boot.img from gki_$arch" am: 6bf3a0aec4Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1992891 Change-Id: I73399a3e4056ac6a2265716d34df92b3672828d0
2022-02-21Merge "Remove init_boot.img from gki_$arch"Treehugger Robot
2022-02-21Remove init_boot.img from gki_$archSzuWei Lin
init_boot.img is a part of platform. gki_$arch does not need to include it. Bug: 216601612 Test: lunch gki_arm64-userdebug; make -j dist Change-Id: I6d6d3ab146be397486ab851e9daccb2c6fef527c
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5c768f6614 -s ours am: 98bd215af3 -s ours am skip reason: Merged-In I6bfdc5e2aa4185e84ac79eb084fa8266ac467072 with SHA-1 a5dd19b8cd is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/16843587 Change-Id: Ibd157a982776db50de3aa71e33f9c3445324bfb0
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5c768f6614 -s ours am skip reason: Merged-In I6bfdc5e2aa4185e84ac79eb084fa8266ac467072 with SHA-1 a5dd19b8cd is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/16843587 Change-Id: Ie0f3e3f2f6bcfa6d69b0f89c69ba9e02bfa41425
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I6bfdc5e2aa4185e84ac79eb084fa8266ac467072 Change-Id: Id37a8ebf3a4d2a19f7ff1aacbfae882e32fa2876
2022-01-24Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8a am: ↵Treehugger Robot
0d9181921c am: 03be79ba3d am: 3e556b630e Original change: https://android-review.googlesource.com/c/device/generic/common/+/1955925 Change-Id: Ibc35285f9a19ced2cf62b50f63a4eeea7b4c565a
2022-01-24Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8a am: ↵Treehugger Robot
0d9181921c am: 03be79ba3d Original change: https://android-review.googlesource.com/c/device/generic/common/+/1955925 Change-Id: I8afdb9ff72a785ce3fc3b4e5eec6e2d96e9e6650
2022-01-24Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8a am: ↵Treehugger Robot
0d9181921c Original change: https://android-review.googlesource.com/c/device/generic/common/+/1955925 Change-Id: I18ddada60628beb5274fdec872c03690bc1b01d5
2022-01-24Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8aTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1955925 Change-Id: I0cae1380d45601ea9c2da048e4f06d16eebabd6c
2022-01-24Merge "Output boot images with kernel 5.15 in gki_$arch"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-24Output boot images with kernel 5.15 in gki_$archSzuWei Lin
Bug: 215643838 Test: build gki_$arch-userdebug; check the outputs Change-Id: I629a526c9be883a3075d79ade0f2c551130430c5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 12:20:13 +0000