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

86485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wei Li
374d334dfc Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: I1b1b1c274ea34103db236678593c19604005be2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 06:30:04 +00:00
Wei Li
84cd6a78ea Merge "Copy SBOM to dist directory when running "m dist"." 2023-04-05 06:00:09 +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
Cole Faust
b51e1ffce4 Make android_certificate_directory public 
This should not be necessary because bp2build should emit a package()
statement with default_visibility = public. However, there appears
to be a problem with bp2build's symlink forest, where it doesn't
handle symlinks correctly.

build/target is a symlink to build/make/target, but in the symlink
forest, build/target is a symlink to the source dir's build/target
instead of to the symlink forest's build/make/target. This means
that when reading this build file via the build/target symlink,
you won't get the bp2build-provided default visibility. (or any other
bp2build generated targets)

We should send a proper fix for this, but in the meantime submit this
quick fix to resolve some failing builds.

Bug: 269577299
Test: lunch bertha_x86_64-userdebug, m nothing
Change-Id: Ia45c7f4a0655b1364b735d6eccf25cad70cad134
 2023-04-04 14:09:27 -07:00
Ibrahim Kanouche
f89fc4aa9b Added Document Fields to SBOM generator 
Added functions to generate unique spdx doc namespace and generate a
clean document name

Test: m compliance_sbom

Bug: 265472710
Change-Id: I86ea9ddf50d066e139b757e8a093f98b8df8c81f
 2023-04-04 18:53:10 +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
Treehugger Robot
645959d878 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a am: 7894336346 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I5e4fe1300d0a1071fc144cf4693d13fe419cc271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:26:19 +00:00
Treehugger Robot
7894336346 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I0cd8f53371f9fee16e1ede1b46cd55726825fb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 07:57:35 +00:00
Treehugger Robot
4091559a4a Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I345b2111df0c1367c1d4bd7ff91695e9d5654522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 07:29:05 +00:00
Treehugger Robot
70c0c6eb81 Merge "Move PRODUCT_BRAND to module_common.mk" 2023-04-04 07:11:11 +00:00
Cole Faust
0fb15ff3b5 Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1 am: f8dfc30a5f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I002891e2458ea08d22d39912a06266ac856daf64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:26:44 +00:00
Cole Faust
f8dfc30a5f Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I7131ed35efe0634b4e28fb4a2c8edeb95d2c12b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:55:03 +00:00
Cole Faust
758b5f0ec1 Merge "Add filegroup of certificates" am: d4b4420a14 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I55b4e195783684f5214abf6c62a201405519d823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:27:00 +00:00
Cole Faust
d4b4420a14 Merge "Add filegroup of certificates" 2023-04-04 03:58:15 +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
f1dd146c2b Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055

Change-Id: I2b3e491fa957229fd6c8ec15e3063ce5b6e89814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 01:26:39 +00:00
Jihoon Kang
02a9cba75c Merge "Create a python script to list files given a directory as an input" am: 155095a314 am: 3a99151087 am: 5ab24a7070 
Original change: https://android-review.googlesource.com/c/platform/build/+/2516096

Change-Id: I5255a50a435ac252650f8ef089a176e06f33f36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 00:58:19 +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
Jihoon Kang
5ab24a7070 Merge "Create a python script to list files given a directory as an input" am: 155095a314 am: 3a99151087 
Original change: https://android-review.googlesource.com/c/platform/build/+/2516096

Change-Id: I219da8935b43c249ccad462ef0dd02d9f2db4fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 00:26:04 +00:00
Treehugger Robot
fb866bac93 [automerger skipped] Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" am: c06f8bbf19 am: 9f5b61e6f2 -s ours am: a1b41a3a7c -s ours 
am skip reason: Merged-In I2d71daa6af97eeb0050e1084b27b03900d2d75ef with SHA-1 f45a8d6e43 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2518155

Change-Id: Ia2987a7896c7a022c043f29e75e87412f4f508ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 00:10:32 +00:00
Jihoon Kang
3a99151087 Merge "Create a python script to list files given a directory as an input" am: 155095a314 
Original change: https://android-review.googlesource.com/c/platform/build/+/2516096

Change-Id: I31e8b764ddd5b522f9d2b83e5c1a9c6c1f0e5e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 23:56:11 +00:00
Jihoon Kang
155095a314 Merge "Create a python script to list files given a directory as an input" 2023-04-03 23:42:19 +00:00
Treehugger Robot
a1b41a3a7c [automerger skipped] Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" am: c06f8bbf19 am: 9f5b61e6f2 -s ours 
am skip reason: Merged-In I2d71daa6af97eeb0050e1084b27b03900d2d75ef with SHA-1 f45a8d6e43 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2518155

Change-Id: I2f1968cd9d35b09fc30591cf98809e831e779382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 23:38:30 +00:00
Treehugger Robot
9f5b61e6f2 Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" am: c06f8bbf19 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518155

Change-Id: I60696679cefd016a8d6c96e85c4b4dbe72e04544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 23:11:06 +00:00
Treehugger Robot
c06f8bbf19 Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" 2023-04-03 22:35:25 +00:00
Cole Faust
2d42461400 Move PRODUCT_BRAND to module_common.mk 
So that we don't need to specify it in individual mainline modules
products, which becomes more important after the internal ones only
inherit from the common aosp product as opposed to the arch-specific
ones.

Bug: 249685973
Test: Diff'd the soong.variables files for the module_* products and saw no differences
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211c5c2810e50a1c5d3bca2f1f7942b624fe3abe)
Merged-In: If1733eb193cd3748fb3562d09bfd41651e2480f9
Change-Id: If1733eb193cd3748fb3562d09bfd41651e2480f9
 2023-04-03 22:19:00 +00:00
Ibrahim Kanouche
4c7ff1f38f Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" am: 960a4700e0 am: 0417e0417f am: a4c8c66a6e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518815

Change-Id: I53310462f506bf0643bbcf734b8e50d7d8d6d84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 22:00:42 +00:00
Ibrahim Kanouche
a4c8c66a6e Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" am: 960a4700e0 am: 0417e0417f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518815

Change-Id: I01ea6aeb582477c61715eb18121b25e06a4f088b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:33:15 +00:00
Ibrahim Kanouche
0417e0417f Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" am: 960a4700e0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518815

Change-Id: Ifcff5eaa79b0d6f32f25f61828939303a657dd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:02:34 +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
Ibrahim Kanouche
960a4700e0 Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" 2023-04-03 19:20:29 +00:00
Jihoon Kang
108379310d Create a python script to list files given a directory as an input 
The script will be used in generating a file that lists generated stub
files from metalava, which will be passed to soong_zip to extract
selected stub files when generating stubs from java_api_library modules
with incomplete api surface text files.

Test: build java_api_library modules in aosp/2487335
Change-Id: I36b830f14c714315f81e3fd8608d84c29f673f83
 2023-04-03 17:52:41 +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
Ulya Trofimovich
86b1dd2b00 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I7493acb1a6aa27d323e9b96ed60e38ac6c571230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 12:08:21 +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
Cole Faust
bf65a62cb9 Add filegroup of certificates 
This is needed for bazel to depend on all certificates from a different
package.

Bug: 269577299
Test: See other cl
Change-Id: I4eeb0b892400fa6bd90080c7e10e9fb762d3b7db
 2023-04-01 14:48:19 -07:00
Ibrahim Kanouche
91f2f9d851 Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" 
This reverts commit 928ee9d9f7.

Reason for revert: Fixed the initial cause of the revert. Added spdx-tools to the missing branches. See b/276427351

Change-Id: I7bd0b3f194b27dc9a255ccadeb2a9a12a3d59f66
 2023-04-01 21:24:30 +00:00
Treehugger Robot
6fb85cbee9 Merge "Move adb keys creation to CI-only step." am: 90206e3493 am: 32e87bddce am: c8fb22c156 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518355

Change-Id: I201656cb4b607aae2b439fd49ab98891ce1a5863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:50:10 +00:00
Treehugger Robot
c8fb22c156 Merge "Move adb keys creation to CI-only step." am: 90206e3493 am: 32e87bddce 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518355

Change-Id: I8cedaec529422aa8a6f861d817323192f4373fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:13:44 +00:00
Treehugger Robot
32e87bddce Merge "Move adb keys creation to CI-only step." am: 90206e3493 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518355

Change-Id: If3051532ca2575289894fc84b36e6eb116be9b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 03:02:41 +00:00
Peter Collingbourne
5c17c38778 Merge "Make kernel prebuilts writable after copying them." am: b327befaae am: 34fa001f55 am: 101d0c4a79 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: I943abb51b134871262b85d3eba9124b06b46773a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:39:52 +00:00
Treehugger Robot
90206e3493 Merge "Move adb keys creation to CI-only step." 2023-04-01 02:21:55 +00: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
34fa001f55 Merge "Make kernel prebuilts writable after copying them." am: b327befaae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: I5324afbb42bacfd419026a4915c9ab3e330c660f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:23:28 +00:00