StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,485 Commits 1 Branch 0 Tags
c63a2b36d74dadb51a9cdcc71ad470111ebe3f02
Commit Graph

33811 Commits

Author SHA1 Message Date
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
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
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
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
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
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable 
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
 2023-04-10 04:02:06 +00:00
Alex Buynytskyy
e7dc4736dc UpsideDownCake is now 34 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
 2023-04-09 15:13:20 +00:00
Treehugger Robot
347607b177 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46 am: b01b05bf69 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: I69642a3d1ae9886ce256ce9b8530c62970fb16ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 05:08:07 +00:00
Treehugger Robot
b01b05bf69 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 04:37:42 +00:00
Cole Faust
5752005ee4 Remove device.mk 
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
 2023-04-07 16:03:58 -07:00
Treehugger Robot
fd24e2486b Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d am: fbf81f8b10 
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: I63f934320589cf6b81d7cc3b4044181de107f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 04:24:45 +00:00
Treehugger Robot
fbf81f8b10 Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: Ifd196ee3ed21cf117a94ece9c9c80c1cf04793f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 03:57:15 +00:00
Treehugger Robot
4ae1b2e2b1 Merge "Add partition compatibility symlinks to installed file list." 2023-04-07 02:45:45 +00:00
Inseob Kim
30d4860a38 Merge "Remove 28.0 compat support" am: 3875d6c82f am: c32b330031 am: e7d0b7a394 
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I00f2661a69e93a96e27c58c595e9330ca4958950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 02:28:34 +00:00
Inseob Kim
e7d0b7a394 Merge "Remove 28.0 compat support" am: 3875d6c82f am: c32b330031 
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I52d6ede32f3716bae22e2798ad29ce25a7702f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 02:00:23 +00:00
Inseob Kim
3875d6c82f Merge "Remove 28.0 compat support" 2023-04-07 00:52:30 +00:00
Treehugger Robot
2918de2847 Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939 am: a0a725c18e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I52180dcc092b24f6ac7e0470f81c69a39c766ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 22:09:23 +00:00
Treehugger Robot
a0a725c18e Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I21ef090d4b06ad872bf67b88605ee33023269a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 21:40:59 +00:00
Treehugger Robot
40472c2371 Merge "Adapt to rearranged NDK sysroot." 2023-04-06 20:46:41 +00:00
TreeHugger Robot
975bbc523e Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp am: 6f523ecca3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22501717

Change-Id: Id180150b57c8875d27d3d43a039c3a1dc033f9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:28:50 +00:00
TreeHugger Robot
6f523ecca3 Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp 2023-04-06 17:12:33 +00:00
Vinh Tran
dc158cff8b Optionally include afdo_profiles.mk if available 
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
 2023-04-06 00:44:03 -04:00
Treehugger Robot
3c1a2d8b33 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985 am: 407d194de4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: I3c0c927ee3ad47dcd9e671f5343f30942b2faa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:51:10 +00:00
Treehugger Robot
407d194de4 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ic7d66f960673a8985c2535016f2da5ca07cb6b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:21:20 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list. 
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
 2023-04-05 11:06:40 -07:00
Wei Li
5bb735bd95 Quote the value of product mfr in case it contains space. 
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
 2023-04-05 10:24:12 -07:00
Juho Kim
bcab31298c Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e am: 0c351860cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: Ib9851ae8860243b4797cbf2a9f27bf9734eec217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 09:32:16 +00:00
Juho Kim
0c351860cd Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 09:01:45 +00:00
Wei Li
95561ab01c Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc am: 225a986e87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: Iae6573b0c25cac36e7daf9bb116a0bff51dae1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 07:50:49 +00:00
Wei Li
225a986e87 Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: I73ec02bf070378ed9994e88cb6f016e9de32bb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 07:13:27 +00:00
Juho Kim
fd358ae340 Revert "Copy SBOM to dist directory when running "m dist"." 
This reverts commit bc7868b18e.

Reason for revert: DroidMonitor: Potential culprit for Bug 277015970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If7d2d070714d5b58e77488d4e26d4003bfc34f79
 2023-04-05 07:10:21 +00:00
Dan Albert
1d7f51da6f Adapt to rearranged NDK sysroot. 
Soong didn't have any explicit references to these paths because it
depends directly on the modules, but the make side of the build still
needs to construct these paths explicitly.

I removed a bunch of dead code that made the fix less obvious while I
was here.

Bug: None
Test: treehugger
Change-Id: I1a283a3bc98a94fc5481c869b3b0a4eacf69d859
 2023-04-04 21:28:51 +00:00
Roberto Gil
5a7c6f0045 [automerge] Bump SDK Extension version to 6 2p: b3300a79f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427132

Bug: 276851559
Change-Id: If22270b175966050ff1a048ec4de2b72994f28e4
 2023-04-04 15:23:13 +00:00
Roberto Gil
b3300a79f6 Bump SDK Extension version to 6 
This bump includes Adservices, Extservices

Bug: 276851559
Test: The build passes
Ignore-AOSP-first: Finalization is not perform in AOSP
Change-Id: I3b087f0d98212a62728d78b10e4c520ca6745cca
 2023-04-04 11:53:45 +00:00
Wei Li
def9517d73 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805 am: f1dd146c2b am: a086cd0154 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055

Change-Id: I8202595ee7082b5072b5589a6181a250a489baa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 02:29:13 +00:00
Wei Li
a086cd0154 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805 am: f1dd146c2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055

Change-Id: Iddbe801a50cce12969bb4d753c1e613493f1ca26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 01:55:25 +00:00
Wei Li
bc7868b18e Copy SBOM to dist directory when running "m dist". 
Bug: 266726655
Test: Run "m dist" and sbom.spdx.json should be in dist directory.
Test: CIs
Change-Id: Iabd3b980863fcb62dd75b6f778c49447073b9cdf
 2023-04-04 00:56:52 +00:00
Wei Li
32789cd805 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." 2023-04-04 00:55:38 +00:00
Treehugger Robot
c06f8bbf19 Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" 2023-04-03 22:35:25 +00:00
Wei Li
ec0881e0c3 Filter out installed files of partitions not built for a target product in SBOM generation. 
Also collect some information of all prebuilt partition images for later use in SBOM generation.

Bug: 272360068
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: I82cd93a50e4230123d47feab9a558211c4276425
 2023-04-03 20:01:34 +00:00
Ulya Trofimovich
72ed6869a4 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00 am: 33267272ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: Ie54445d1a99fdb569319c3b31a6d6622f8edb0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 13:08:32 +00:00
Ulya Trofimovich
33267272ab Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00 
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 12:37:37 +00:00