Commit Graph

32913 Commits

Author SHA1 Message Date
Treehugger Robot
36b1360655 Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2447682

Change-Id: Ia9fe8644d335faf13e40036166708ae58c89b337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:54:39 +00:00
Treehugger Robot
fddcbb03a1 Merge "Add zip2zip to dependency of relevant binary targets" 2023-02-22 19:46:32 +00:00
Kelvin Zhang
6d366d36e4 Add zip2zip to dependency of relevant binary targets
Bug: 269735619
Change-Id: I7eb3de066ec17cfcb072b4072997e3bafa83fbcd
2023-02-21 12:49:20 -08:00
Vincent Donnefort
07738c42b2 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: Iace7a345a0ea5cfa19eb80d20179c2166bd89363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:33:49 +00:00
Vincent Donnefort
65af9993b3 Merge "Fix missing dev nodes in init_boot.img ramdisk" 2023-02-20 09:24:04 +00:00
Zhenhuang Wang
c14d68cebe Merge "Enable -sha256 feature to device-tests.zip" am: 195b5fc64c
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621

Change-Id: Iea20ef137e33304479451116f8911cf3ec55735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 08:03:32 +00:00
Vincent Donnefort
6e861e9cf8 Fix missing dev nodes in init_boot.img ramdisk
Previously ("Add null and console dev nodes to the Android initramfs")
introduced into init_boot.img the /dev/console and /dev/null nodes.
Sadly, it missed changing the release tools which are also generating
images in their own way.

Bug: 254835242
Change-Id: I4d2893ac24c09cf0d117422cbe2bde66083e7118
2023-02-17 10:52:28 +00:00
Zhenhuang Wang
d1dfcda616 Enable -sha256 feature to device-tests.zip
With `-sha256` flag, file header of generated zip files contains
SHA256 checksum for each file, which can then be used by downstream
systems.

Bug: 259513199
Test: m dist device-tests
Change-Id: Id5d2cba9096983da4f4843146a5eaa84393b4880
2023-02-17 17:48:24 +08:00
Treehugger Robot
287c48cda6 Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I9f9a37e11c1c3c889ec1b295cabceb8de4102d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 08:12:44 +00:00
Treehugger Robot
272d090d39 Merge "Rename otatools dependency from futility to futility-host" 2023-02-16 07:39:05 +00:00
Zhenhuang Wang
963bc9676e Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I8c9201b19e39bfa3455c1fd231d21cdfa174f5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:10:39 +00:00
Zhenhuang Wang
371da61096 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" 2023-02-16 02:10:40 +00:00
Aaron Kling
e380321735 Rename otatools dependency from futility to futility-host
The futility target for host is futility-host. This is required for
ryu out of tree signing.

Change-Id: I6c06ec69f991abc23597e19dd4478774cc4d56c4
2023-02-15 21:12:23 +00:00
Xin Li
27b4d0c71f Merge "Merge TQ2A.230305.008" into stage-aosp-master 2023-02-15 19:45:53 +00:00
Spandan Das
3c48d0938d Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: Iaa2c36fc11d69793ec0a7a455191a3846ec400e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:48:55 +00:00
Kelvin Zhang
f0a1afdd56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ia538767800ec15b648b21ea84c215b28ccfa8ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:47:30 +00:00
Spandan Das
d3e1b41c33 Merge "Dist api_fingerprint file for droidcore" 2023-02-15 18:06:27 +00:00
Kelvin Zhang
8ffc90d4e9 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" 2023-02-15 18:03:02 +00:00
Kelvin Zhang
19961b53c4 Copy all files from BOARD_SYSTEM_DLKM_SRC
BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
2023-02-14 18:23:28 -08:00
Xin Li
95bbef8402 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Change-Id: I0cf59fc2635e8d951da0bbeced842f92c3d5b655
2023-02-14 16:13:00 -08:00
Yike Zhang
af6394b6e7 Merge "Export test config info to module-info while the module is uninstallable" am: 249865de52
Original change: https://android-review.googlesource.com/c/platform/build/+/2434932

Change-Id: I40a388305ce29b73c2fe8de71ba6d119554398ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 23:48:45 +00:00
Spandan Das
10cd857c3f Dist api_fingerprint file for droidcore
Currently it only gets disted for `sdk`

Bug: 266791853
Test: m dist droidcore, and checked out/dist/api_fingerprint.txt
Change-Id: I098c3890d7290a5f0094fea056cbc8bf1684df11
2023-02-14 21:26:55 +00:00
Yike
40f5c3a1fe Export test config info to module-info while the module is uninstallable
All Robolectric tests are set as uninstallable modules, which skips the
logic exporting `test_config` and `auto_test_config` to module-info.
But downstream infra needs this information to determine if a module is
a test module. So that this change moves the logic that sets
`test_config` and `auto_test_config` for Robolectric tests out of the
snippet specifically for installable module.

Test: m out/target/product/coral/module-info.json
Bug: 268670243
Change-Id: Icf4caf3d6833f3a39927fb69c6fb76762b8f6f14
2023-02-15 03:18:28 +08:00
Zhenhuang Wang
23d8c72472 Revert "Revert "Enable -sha256 feature to some Soong built zip files""
This reverts commit 7d8eeec0dd.

Reason for revert: re-submit the change https://r.android.com/2393272

Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68
2023-02-14 00:29:30 +00:00
Android Build Coastguard Worker
5ca47f57b1 Version bump to TQ2A.230305.008 [core/build_id.mk]
Change-Id: I20a857714f506097c06cf8168b7ec368a3117612
2023-02-11 17:28:31 +00:00
Treehugger Robot
6dd3de71fc Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c696
Original change: https://android-review.googlesource.com/c/platform/build/+/2411433

Change-Id: I68642f18887195be07f4c66f53cf8bdeda39d051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 10:11:57 +00:00
Treehugger Robot
fa7113c696 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" 2023-02-11 09:25:04 +00:00
Kelvin Zhang
0dbfd70963 Support BOARD_SYSTEM_DLKM_SRC build config
In aosp/2323114 , BOARD_SYSTEM_DLKM_SRC is removed in favor of
BOARD_SYSTEM_KERNEL_MODULES . However, BOARD_SYSTEM_DLKM_SRC preserves
directory structure of input kernel modules, where as
BOARD_SYSTEM_KERNEL_MODULES flattens everything by copying all modules
into the same directory. This causes some issues as vendor_dlkm that
depend on system_dlkm modules now need to update their modules.dep file
due to changes in path. For backward compatibility, add support
for BOARD_SYSTEM_DLKM_SRC .

When both BOARD_SYSTEM_DLKM_SRC and BOARD_SYSTEM_KERNEL_MODULES are
set, BOARD_SYSTEM_KERNEL_MODULES will be preferred. The priority is arbitrary,
but we need a defined ordering to prevent double copying.

Test: th
Bug: 267014648
Change-Id: Ib2f5229af02ea2b7c0d96da70afed9118f484c97
2023-02-10 21:06:53 -08:00
Zhenhuang Wang
97e73564c3 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: I947c01778145669c5cb36d3645f1cd6d43988674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 14:46:18 +00:00
Zhenhuang Wang
65ff0460c4 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" 2023-02-10 14:11:49 +00:00
Zhenhuang Wang
7d8eeec0dd Revert "Enable -sha256 feature to some Soong built zip files"
This reverts commit fae06b15ce.

Reason for revert: Some labs are still not upgraded to the latest version, causing presubmit test flaky.

Bug: 268608699
Bug: 259513199
Change-Id: I05f0fef27afdbbd5350e77616074059b7bf1da42
2023-02-10 14:02:06 +00:00
Zhenhuang Wang
5c8213b1bd Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: I151922ca28ec3f876298898c9a1ab00b55666f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 08:28:24 +00:00
Zhenhuang Wang
9544346d39 Merge "Enable -sha256 feature to some Soong built zip files" 2023-02-10 08:00:44 +00:00
Jiakai Zhang
ae60455886 Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694

Change-Id: If189521931a7dd959f260ef1408799550bb54c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 14:42:57 +00:00
Jiakai Zhang
9964bf51e5 Merge "Revert "Don't disable dexpreopt for an unbundled build."" 2023-02-09 14:01:59 +00:00
Jiakai Zhang
60c08f24a7 Revert "Don't disable dexpreopt for an unbundled build."
This reverts commit d5d8904e52.

Reason for revert: Maybe broke the build on git_stage-aosp-master on mainline_modules_x86_64-userdebug

Change-Id: Ia33a642abda127b43aa6e265deb43dca7ee04f34
2023-02-09 12:56:59 +00:00
Treehugger Robot
f8149c5688 Merge "Migrate to the new clang lib dir" am: 99014b038c
Original change: https://android-review.googlesource.com/c/platform/build/+/2428752

Change-Id: I87a3b04cad809bb5f8eb7d4fd6f08ef34d304530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 11:32:01 +00:00
Yi Kong
e4b8f48a6d Migrate to the new clang lib dir
Test: presubmit
Change-Id: Ib409725d540d285dfd840bcd3de33020218f3bc0
2023-02-09 15:17:04 +09:00
Jiakai Zhang
8f1a701b8f Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2425454

Change-Id: Ib352612a51574c623334cd670d7762125469fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:16:35 +00:00
Jiakai Zhang
0a3f6a2bb5 Merge "Don't disable dexpreopt for an unbundled build." 2023-02-08 17:39:51 +00:00
Treehugger Robot
a154b87205 Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Treehugger Robot
288f5ca642 Merge "Use the init_boot partition name with avb for prebuilt" am: 5683ef1934
Original change: https://android-review.googlesource.com/c/platform/build/+/2422906

Change-Id: I56de457de93fcc36ecab79390c6b4ad908c643eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:08:43 +00:00
Treehugger Robot
5683ef1934 Merge "Use the init_boot partition name with avb for prebuilt" 2023-02-08 01:38:11 +00:00
Treehugger Robot
780964e41b Merge "Make words() work on a list of non-strings" am: 6086c5ce5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2424056

Change-Id: I74650b2b2d7800d509f2fb558a242df8664b1377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 01:25:10 +00:00
Treehugger Robot
6086c5ce5f Merge "Make words() work on a list of non-strings" 2023-02-08 00:52:24 +00:00
Cole Faust
2b5b3f3be8 Make words() work on a list of non-strings
words() attempts to join all the elements of a list
and then resplit them to more closely match make.
But sometimes, like when calling words() on a product
variable, not all of the elements are strings. In
that case, just return the list unchanged.

Bug: 267407943
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I738d0c86c8935f446807cc79623f796e8cae3c01
2023-02-07 12:28:47 -08:00
Jiakai Zhang
d5d8904e52 Don't disable dexpreopt for an unbundled build.
Dexpreopt generates profiles that need to be installed in the APEX.
Soong will skip the dex2oat step after it generates the build rule for
profiles.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
2023-02-08 03:47:24 +08:00
Xin Li
fc740c9920 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Change-Id: I6c6ce54d95ea5b44d4907a710e36f2fcd80991a6
2023-02-06 21:07:34 -08:00
Devin Moore
77ae07dc5b Use the init_boot partition name with avb for prebuilt
When building a target with a prebuilt init_boot image, we still need to
use the correct name for the image.

Test: m
Bug: 268050089
Change-Id: I8fd11d8c17c2c140b7cff1dd8255c8b8728ea196
2023-02-06 17:25:06 +00:00
Android Build Coastguard Worker
f159d350f6 Version bump to TQ2A.230305.007 [core/build_id.mk]
Change-Id: Iec89798bdc3314925f92cc0e47d31ce32b11adb8
2023-02-04 03:50:22 +00:00