Commit Graph

34601 Commits

Author SHA1 Message Date
Wei Li
b3565b4aa4 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 18:21:26 +00:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Vinh Tran
ebce49601a Split PRODUCT_AFDO_PROFILES into two variables
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.

Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list

Ignore-AOSP-First: ag/22604900 in the same topic is in internal repo
Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
2023-04-19 15:54:13 +00:00
Colin Cross
64fae70977 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7 am: d844885259
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I70c0736a9c50524e21c6e20c44e473210e2b0451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:12:30 +00:00
Colin Cross
d844885259 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 04:23:50 +00:00
Android Build Coastguard Worker
e14c8feef8 Version bump to UP1A.230419.002 [core/build_id.mk]
Change-Id: If766ef2dc0a0566f2c7ccfc1ac7d8f4210cc475b
2023-04-19 03:01:17 +00:00
Android Build Coastguard Worker
7131f1184d Make change and version bump to UP1A.230419.001
Snap for 9966400 from 9362cc8e1c to udc-release

Change-Id: I9d00f44b3fb89061282524f7d313dd55ba3277d5
2023-04-19 02:11:48 +00:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory.
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
2023-04-18 15:57:34 -07:00
Android Build Coastguard Worker
0664f3fe65 Version bump to UP1A.230418.004 [core/build_id.mk]
Change-Id: Ibed509071365876e8f60dea481b678f1b4c17b41
2023-04-18 21:43:16 +00:00
Colin Cross
bc18b00770 Move old installed file cleanup logic below build/make/core/Makefile
build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.

Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
2023-04-18 11:32:24 -07:00
Android Build Coastguard Worker
a95a9d96dc Version bump to UP1A.230418.003 [core/build_id.mk]
Change-Id: Iafb2b1a980abda4c73619654ba61aefb5c7cc053
2023-04-18 06:52:07 +00:00
Inseob Kim
168ab6af74 Remove lunch target from appcompat log
This is to reduce build rule divergence among targets. We only need the
path under PRODUCT_OUT.

Bug: 277662244
Test: build and boot
Change-Id: Ica8776d1779c47305c3c74015be2b3597cbdf95c
2023-04-18 14:02:52 +09:00
Android Build Coastguard Worker
52c8e12c14 Version bump to UP1A.230418.002 [core/build_id.mk]
Change-Id: If6798f83b0fa260419896118d4482e5c53684b2b
2023-04-18 02:52:10 +00:00
Android Build Coastguard Worker
069591d97a Make change and version bump to UP1A.230418.001
Snap for 9957928 from cf2e6a745e to udc-release

Change-Id: Ida8a4756d62aa0c0d1ccf54aac56bf7891754c87
2023-04-18 02:26:23 +00:00
Android Build Coastguard Worker
b53443b59a Version bump to UP1A.230417.002 [core/build_id.mk]
Change-Id: I08c0767d77ced0b3c93281f913872f2c5e270e70
2023-04-18 00:26:19 +00:00
Android Build Coastguard Worker
b0ba46d0ab Make change and version bump to UP1A.230417.001
Snap for 9951768 from d6ff8ca1c5 to udc-release

Change-Id: I7aa714a67873bb81fce2b8524a97b1a9b437c58b
2023-04-17 00:03:27 +00:00
Android Build Coastguard Worker
b9ae4b4060 Make change and version bump to UP1A.230416.001
Snap for 9950291 from e78f998ebf to udc-release

Change-Id: I4f48eea4cf956657d74b08efb280a7f015198b66
2023-04-16 00:03:28 +00:00
Android Build Coastguard Worker
de5f6dd42e Make change and version bump to UP1A.230415.001
Snap for 9947982 from 55decf2e29 to udc-release

Change-Id: I4ce3dc46d910e8064bed4d8c4aa5c1ac57e46408
2023-04-15 04:34:18 +00:00
Florian Mayer
074dce314c Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d am: aca0515f1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Android Build Coastguard Worker
5959c353b6 Version bump to UP1A.230414.003 [core/build_id.mk]
Change-Id: I10cc12aaf42336276dd76c79f07b5c1b944fd924
2023-04-14 18:13:57 +00:00
Android Build Coastguard Worker
d277eccac5 Version bump to UP1A.230414.002 [core/build_id.mk]
Change-Id: Ic2f21b1d98511c482f4ed04c2ae9faf93848c71d
2023-04-14 05:19:29 +00:00
Android Build Coastguard Worker
5147f94e65 Make change and version bump to UP1A.230414.001
Snap for 9939584 from 73f61e7ede to udc-release

Change-Id: Ibc76f46958de29bc4d5a696bfc399e3ebe9e7c6a
2023-04-14 02:08:11 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
73f61e7ede Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e am: c129df521c
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: I6bce6615763f6e2d5d1fb1faba0f2879a0704b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:09:07 +00:00
Treehugger Robot
c129df521c Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: Ie5cc79ab5616cb59828b7506f53ca28f0f7e763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 19:04:08 +00:00
Android Build Coastguard Worker
a355f5dae0 Version bump to UP1A.230413.002 [core/build_id.mk]
Change-Id: I1c132aa5e2db4a1c4831cf2f26d7773535c93693
2023-04-13 18:28:26 +00:00
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +00:00
Wei Li
b05968e183 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b am: f27ff5e616
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I23fa0c10ae08c9b80e93aa051e8f960ffb24fe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 17:30:04 +00:00
Wei Li
f27ff5e616 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I04420fa2bb20743249e515a47a51e2d0dcc87c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 16:43:58 +00:00
Android Build Coastguard Worker
76cfccfac6 Make change and version bump to UP1A.230413.001
Snap for 9930594 from b89decdb1b to udc-release

Change-Id: I91cc154aa448f290378de61f8743cff3ae23351f
2023-04-13 02:51:31 +00:00
Wei Li
c4d0a61ee3 Copy SBOM files to directory dist/sbom instead of dist/.
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.

Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
2023-04-13 02:12:32 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Android Build Coastguard Worker
68c37dccad Version bump to UP1A.230412.002 [core/build_id.mk]
Change-Id: I5d2927fdea78c909af205a6e1646a51d34e115ef
2023-04-12 15:03:28 +00:00
Wei Li
cbeaa85076 Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b am: 82bf15a96d
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I3bbd10804b31aeccf1d1d386bb9c829d0b8cc27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:33:47 +00:00
Wei Li
82bf15a96d Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:00:47 +00:00
Android Build Coastguard Worker
761691c4e0 Make change and version bump to UP1A.230412.001
Snap for 9921839 from f85af51468 to udc-release

Change-Id: I2588953bf25c765938ae198ec0da3ea1a3fa9286
2023-04-12 02:08:29 +00:00
Wei Li
ff8e18cf3e Revert "Revert "Copy SBOM to dist directory when running "m dist".""
This reverts commit fd358ae340.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
2023-04-11 23:43:54 +00:00
Treehugger Robot
f85af51468 Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp am: cbcde78d22
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Change-Id: If47f10b8d733055b04e0c9a81f525011de706765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 20:59:31 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Android Build Coastguard Worker
b9682c0ad4 Version bump to UP1A.230411.002 [core/build_id.mk]
Change-Id: I5980cd1959cdd705b3d51c1ce79ef56edefa5a58
2023-04-11 02:58:07 +00:00
Android Build Coastguard Worker
d90fac338e Make change and version bump to UP1A.230411.001
Snap for 9914775 from d855a7116a to udc-release

Change-Id: I36b5fb65b561ad3f968457a9f1e033daadc72981
2023-04-11 02:07:42 +00:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
2023-04-11 01:54:58 +00:00
Alex Buynytskyy
e7a6a78032 Merge "UpsideDownCake is now 34" into udc-dev 2023-04-11 01:17:31 +00:00
Android Build Coastguard Worker
39a8a22d00 Version bump to UP1A.230410.002 [core/build_id.mk]
Change-Id: I7e5ce9dc124f0b191b29cfa259a7bae51624be30
2023-04-11 00:36:11 +00:00
Jooyung Han
5b11f313cd Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0 am: ac1368846a
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I315975e654f43fe0632ca97039c7d69d4c448803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 09:33:14 +00:00
Jooyung Han
ac1368846a Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 09:02:48 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00:00