StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,374 Commits 1 Branch 0 Tags
8c82f8e5c110a30aaf66576c4b5cfe9eb66a6afd
Commit Graph

33253 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
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
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
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
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
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
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
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ulya Trofimovich
1d3c4ae036 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-04-03 11:31:42 +00:00
Inseob Kim
df74fa7504 Remove 28.0 compat support 
Treble doesn't support U system + P vendor, so removing P (28.0)
prebuilts and compat files.

Bug: 267692547
Test: build
Change-Id: I943a1f70b3600918a375ff62a20d45cfae2f673e
 2023-04-03 15:18:28 +09:00
Peter Collingbourne
101d0c4a79 Merge "Make kernel prebuilts writable after copying them." am: b327befaae am: 34fa001f55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: Iae457c184385f6e384520a6bfaf2aa4361974ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:54:05 +00:00
Peter Collingbourne
b327befaae Merge "Make kernel prebuilts writable after copying them." 2023-04-01 00:33:43 +00:00
Vinh Tran
2b2f6685ab Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var 
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
Merged-In: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
 2023-03-31 17:54:49 -04:00
Vinh Tran
f45a8d6e43 Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var 
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
 2023-03-31 14:29:48 +00:00