Commit Graph

34149 Commits

Author SHA1 Message Date
Ivan Kozlov 🤷🏻‍♂️
61ecc0adae Merge "Add Traefed Contrib to CATBox" 2022-12-07 19:58:27 +00:00
Steve Berbary
b601ce96db Update Security String to 2023-02-01
Bug: 261738635

Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-07 19:21:42 +00:00
Steve Berbary
79e595f4e3 Update Security String to 2023-02-05
Bug: 261738635
Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-07 19:17:24 +00:00
Kelvin Zhang
395d3df406 Default to not generating modules.dep for system side
Test: th
Bug: 149866755
Change-Id: I36c26bed46f43ca8ff7d4afdaf3ee1d7e1c70c3f
2022-12-07 10:36:10 -08:00
Treehugger Robot
bea37a20a2 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806 am: 4e983209c7 am: 16085dd465
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: Ia5ff59e7789bf0a8b795f094325d42619ba5e34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 05:33:39 +00:00
Treehugger Robot
16085dd465 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806 am: 4e983209c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: Ifbfe1fb17c1e7da40266a050af023197ff47bf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 05:07:00 +00:00
Treehugger Robot
4e983209c7 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: I81655d0dc7410e2e0ecc44bdb7ad7f353f475b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 04:26:47 +00:00
Treehugger Robot
3de79b1806 Merge "Fix typo in cross partition dependency generation" 2022-12-07 03:33:42 +00:00
Android Build Coastguard Worker
e00fb100a6 Make change and version bump to TQ2A.221207.001
Change-Id: I0521a4d693e44901adc374a4bdd61be950afe766
2022-12-07 01:00:10 +00:00
Kelvin Zhang
21b6cade74 Fix typo in cross partition dependency generation
intention was to symlink modules in vendor_dlkm to system_dlkm. Typo
caused the same modules to link itself.

Test: build, make sure vendor_dlkm's modules.dep contains system
dependency

Change-Id: I19664cd9a8578566d3a038885b8ce27556801a79
2022-12-06 16:31:02 -08:00
Treehugger Robot
847ba278d9 Merge "Generate cross partition kernel module dependencies" am: b4b8760144 am: 7279c72b74 am: b149b99775
Original change: https://android-review.googlesource.com/c/platform/build/+/2325560

Change-Id: I5d25f65f701c3df4ccbbf092a8b81cda67319366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 09:16:03 +00:00
Treehugger Robot
b149b99775 Merge "Generate cross partition kernel module dependencies" am: b4b8760144 am: 7279c72b74
Original change: https://android-review.googlesource.com/c/platform/build/+/2325560

Change-Id: Ib538599de01da23ef7866094e0880ef659d902bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 08:32:52 +00:00
Treehugger Robot
7279c72b74 Merge "Generate cross partition kernel module dependencies" am: b4b8760144
Original change: https://android-review.googlesource.com/c/platform/build/+/2325560

Change-Id: I631211f39ada0d0ff483183a5788f817676c14a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 07:58:01 +00:00
Treehugger Robot
b4b8760144 Merge "Generate cross partition kernel module dependencies" 2022-12-06 07:30:56 +00:00
Kiyoung Kim
07420ce747 Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b0b am: 987e4d6fa6 am: 54d69c6244
Original change: https://android-review.googlesource.com/c/platform/build/+/2322555

Change-Id: I2bfb532076c3cbe23b3634e483a989913860952c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:32:22 +00:00
Treehugger Robot
33456ef105 Merge changes I745168c4,I5d854b5d am: 2f7570efc9 am: cd3204570b am: 225c50e7fc
Original change: https://android-review.googlesource.com/c/platform/build/+/2328796

Change-Id: I962eaff3cfd2b2536446734640db70f1fd99006d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:31:35 +00:00
Ivan Kozlov 🤷🏻‍♂️
f723166503 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed am: 28a3ea8628 am: 9ae89f8119
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I31e416d226f4e4465197ed04527c6dc49648e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:31:10 +00:00
Spandan Das
72e785f290 Merge "New product config flag to gate blueprint modules" am: ed055c7f7d am: c98a1d9367 am: dbc3322ea7
Original change: https://android-review.googlesource.com/c/platform/build/+/2296764

Change-Id: Iebe8e51f960770059ffa302ff2f2ec13538a765b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:29:44 +00:00
Kiyoung Kim
54d69c6244 Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b0b am: 987e4d6fa6
Original change: https://android-review.googlesource.com/c/platform/build/+/2322555

Change-Id: I3de47d78489aac6310f4e106cd351891e5b9df2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:27:47 +00:00
Android Build Coastguard Worker
a6ce756952 Make change and version bump to TQ2A.221206.001
Change-Id: I67006703b8d5e2c5cc96c030adeba589d6750cc7
2022-12-06 01:01:02 +00:00
Kiyoung Kim
987e4d6fa6 Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2322555

Change-Id: Ifd524a5f1a2b9501d6a2fc00d2e1a70ffa4fc5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:56:27 +00:00
Treehugger Robot
225c50e7fc Merge changes I745168c4,I5d854b5d am: 2f7570efc9 am: cd3204570b
Original change: https://android-review.googlesource.com/c/platform/build/+/2328796

Change-Id: I0bc6e0d759d0934025bb5616a65592eb3c95bdfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:51:34 +00:00
Ivan Kozlov 🤷🏻‍♂️
9ae89f8119 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed am: 28a3ea8628
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I5e4c840df5571a604037e3e245cb8c58c0c620e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:50:44 +00:00
Spandan Das
dbc3322ea7 Merge "New product config flag to gate blueprint modules" am: ed055c7f7d am: c98a1d9367
Original change: https://android-review.googlesource.com/c/platform/build/+/2296764

Change-Id: Iba4e1b7ef920768a0160bec29b328be8c9f552a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:50:21 +00:00
Kiyoung Kim
eb3af10b0b Merge "Append LLNDK libraries in the APEX to the system linker config" 2022-12-06 00:48:15 +00:00
Treehugger Robot
cd3204570b Merge changes I745168c4,I5d854b5d am: 2f7570efc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2328796

Change-Id: I4acc19e7696bb7153c40e43332ca0531bf69725e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:20:37 +00:00
Ivan Kozlov 🤷🏻‍♂️
28a3ea8628 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I051cb5e69d62c015453be6e3a2d772c19cc821f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:19:49 +00:00
Spandan Das
c98a1d9367 Merge "New product config flag to gate blueprint modules" am: ed055c7f7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2296764

Change-Id: If6ba0e6a4a9c9251095a2dbb1f0cf44009bfad50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:18:11 +00:00
Treehugger Robot
2f7570efc9 Merge changes I745168c4,I5d854b5d
* changes:
  Split envsetup.sh PATH setting into lunch-dependent and lunch-independent values
  Lock down envsetup.sh to a small number of people
2022-12-06 00:15:30 +00:00
Ivan Kozlov 🤷🏻‍♂️
8ca7184bed Merge "Add catbox owners to the OWNERS file" 2022-12-06 00:10:11 +00:00
Spandan Das
ed055c7f7d Merge "New product config flag to gate blueprint modules" 2022-12-05 23:50:23 +00:00
Kelvin Zhang
8dab9b1c94 Merge "Allow empty modules.load file to be generated" am: ac296d5cc6 am: 902eefd65b am: 6d1d1992e2
Original change: https://android-review.googlesource.com/c/platform/build/+/2325265

Change-Id: Id76d7f9a765ff19e2c941c8ccbeb5d219fa318ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 23:39:04 +00:00
Treehugger Robot
8cee2c14a0 Merge "target_files: Package pvmfw.bin under PVMFW/" am: 056f6b2d46 am: d2fe273089 am: 4fba64422b
Original change: https://android-review.googlesource.com/c/platform/build/+/2238519

Change-Id: I9653a5f1f52fe0cd3b1e684a3c4220c06c481de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 23:37:20 +00:00
Kelvin Zhang
6d1d1992e2 Merge "Allow empty modules.load file to be generated" am: ac296d5cc6 am: 902eefd65b
Original change: https://android-review.googlesource.com/c/platform/build/+/2325265

Change-Id: I684c36b2a753692c59f475c2aaa4155e1bbbb9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 23:34:52 +00:00
Kelvin Zhang
902eefd65b Merge "Allow empty modules.load file to be generated" am: ac296d5cc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2325265

Change-Id: Ib1f3ea10dae94a331cb568bd557b91786e9a655b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 23:03:50 +00:00
Kelvin Zhang
d5f06113b7 Generate cross partition kernel module dependencies
Kernel modules in vendor_dlkm might have dependency on system_dlkm. To
correctly generate modules.dep files, copy system_dlkm modules to depmod
staging dir before calling depmod.

Test: m, check $OUT/vendor_dlkm/lib/modules/module.dep, make sure it
contains dependency on /system/lib/modules
Bug: 149866755

Change-Id: Ibdf6d63df1413543471a3d18108eba6fdcde9ba4
2022-12-05 15:01:18 -08:00
Treehugger Robot
4fba64422b Merge "target_files: Package pvmfw.bin under PVMFW/" am: 056f6b2d46 am: d2fe273089
Original change: https://android-review.googlesource.com/c/platform/build/+/2238519

Change-Id: I9abb82086ae737ff1fc40459a4d04cb18219d5db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 22:58:49 +00:00
Kelvin Zhang
ac296d5cc6 Merge "Allow empty modules.load file to be generated" 2022-12-05 22:36:08 +00:00
Treehugger Robot
d2fe273089 Merge "target_files: Package pvmfw.bin under PVMFW/" am: 056f6b2d46
Original change: https://android-review.googlesource.com/c/platform/build/+/2238519

Change-Id: Ia8f3972e24e08a1074ed5e4451fd0d442232bebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 22:27:57 +00:00
Treehugger Robot
056f6b2d46 Merge "target_files: Package pvmfw.bin under PVMFW/" 2022-12-05 22:00:43 +00:00
Treehugger Robot
a09c9406c1 Merge "Handle non-module fsv_meta files." am: 33544af4d1 am: 44b902c9b4 am: acf8cbb6ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2320963

Change-Id: I8fe088bc2268130ba3cb2d7440009b8362b8b449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 21:53:59 +00:00
Treehugger Robot
acf8cbb6ba Merge "Handle non-module fsv_meta files." am: 33544af4d1 am: 44b902c9b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2320963

Change-Id: I5ff4d6ef538999fac4afb323bce4d238b7f6e883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 21:15:52 +00:00
Joe Onorato
7c3a77f4c9 Split envsetup.sh PATH setting into lunch-dependent and lunch-independent values
This gets b (and other scripts that are coming soon) into the path without running lunch.

Also gets rid of the make dumpvar ANDROID_BUILD_PATHS variable, used to set a few more paths,
so that the setting is all in one place, now that the get_abs_build_var is cached.

Test: Lots of manual checks of before and after combinations
Change-Id: I745168c43ccf2fef4cdd22657fd087f1ad07e510
2022-12-05 13:13:37 -08:00
Kelvin Zhang
b66b11ec9a Allow empty modules.load file to be generated
Currently, if BOARD_*_KERNEL_MODULES_LOAD is set to empty string, we
default to load all modules listed in BOARD_*_KERNEL_MODULES. For
system_dlkm, we do not want to load any modules unless they are
dependency of vendor kernel modules. Therefore we need to create an
empty modules.load file for system_dlkm. Add 'false' as an out of band
value to indicate that an empty modules.load file should be generated.

Bug: 149866755
Test: th
Change-Id: Ieaaeb2f9a824e97671acff465bbd4da83dfd9aa0
2022-12-05 13:04:42 -08:00
Treehugger Robot
44b902c9b4 Merge "Handle non-module fsv_meta files." am: 33544af4d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2320963

Change-Id: I2c8e105e1e8531015b5c74ff49b7776f90ade866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:01:07 +00:00
Spandan Das
00114d4418 New product config flag to gate blueprint modules
Example usage:
PRODUCT_INCLUDE_TAGS += use_myspecial_sdk

This also populates the allowlist with go/nogo mainline tags. Usage of
`PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error
in product config

Test: TH

Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
2022-12-05 19:47:12 +00:00
Treehugger Robot
33544af4d1 Merge "Handle non-module fsv_meta files." 2022-12-05 19:21:22 +00:00
Pierre-Clément Tosi
03975ed738 target_files: Package pvmfw.bin under PVMFW/
Add the pvmfw.bin binary to the target_files archive to bring back
ATC-based change detection for pvmfw (which compares the content of
PVMFW/ between builds) and therefore bring back our TreeHugger
pre-submit tests for it. Those were introduced in c7b837872d ("Create
$(zip_root)/PVMFW & archive prebuilt used") but inadvertently removed
in d000004876 ("core: Get pmvfw.img partition from Soong").

Bug: 261393794
Test: m target-files-package
Change-Id: I0141d59154b54641cb348af3b98fe12624d5939e
2022-12-05 13:08:34 +00:00
Android Build Coastguard Worker
d8aa2eef95 Make change and version bump to TQ2A.221205.001
Change-Id: Ic8f9841f32531aebc4fa1dea4915e57a271ae37e
2022-12-04 23:03:55 +00:00
Android Build Coastguard Worker
d800b6a169 Make change and version bump to TQ2A.221204.001
Change-Id: I34b67f9dfa785491ed4d186e06addca8dd9af0ac
2022-12-03 23:03:35 +00:00