StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,177 Commits 1 Branch 0 Tags
398a89be8abedc15919fab6fdbfd391ddf13f53c
Commit Graph

84177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jihoon Kang
398a89be8a Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e am: 10bc93a66e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: I57a7cf94a8cf5c48ee69a0f75b348087341d62e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:59:40 +00:00
Jihoon Kang
10bc93a66e Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: Ie9daa5fbe022330bdcc8c8293760be330035b494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:32:54 +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
Jihoon Kang
0c76cab34e Merge "Specify list_files to be built with embedded launcher" 2023-04-06 16:54:02 +00:00
Jihoon Kang
8f6edbbf04 Specify list_files to be built with embedded launcher 
In the current use case of list_files, the module is built with a
possibly incompatible host machine's python version. This change fixes
this by specifying module to be built with embedded launcher.

Test: m list_files
Bug: 277124374
Change-Id: Id894271042136c9db50e63852075a8c4ef36a71e
 2023-04-06 05:25:20 +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
Treehugger Robot
7171df5985 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ia91a20cf443d0a6a7c2cd72b9329319620718150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:52:00 +00:00
Treehugger Robot
557a4d56c9 Merge "Quote the value of product mfr in case it contains space." 2023-04-05 21:20:18 +00:00
Ibrahim Kanouche
52d2d30323 Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 am: ac35dfa24a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: I6714effcd6899c51feffe7f53b3247e17d3dcf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:06:14 +00:00
Treehugger Robot
2ce394b862 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I00951f29562d13a8fda6a97df96a00232978967a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:04:12 +00:00
Ibrahim Kanouche
ac35dfa24a Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: Id8010c266ac0d7f915b093276e40b9f4c828d92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:50:59 +00:00
Ibrahim Kanouche
aeeea61aa0 Merge "Added Document Fields to SBOM generator" 2023-04-05 20:37:04 +00:00
Treehugger Robot
f2188a7994 Merge "Make android_certificate_directory public" am: 42bc8b9809 
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I74a369c22d2427f871b01bd3cfc977cc46d688a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:34:48 +00:00
Treehugger Robot
42bc8b9809 Merge "Make android_certificate_directory public" 2023-04-05 19:40:51 +00:00
Kelvin Zhang
3dc5fb7392 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 am: c8e58a10a0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Ic11be84be27ee80860202f387961de1e518f6ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:46:57 +00: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
Kelvin Zhang
c8e58a10a0 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Id42a2d155af74eb7f885199d8761507216ceed03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:18:11 +00:00
Kelvin Zhang
3aa4644117 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" 2023-04-05 16:40:36 +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
Juho Kim
3d396b837e Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I65f143ea09fadea705973a639be296e39600d374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 08:32:33 +00:00
Juho Kim
79e77ec4b5 Merge "Revert "Copy SBOM to dist directory when running "m dist"."" 2023-04-05 07:46:42 +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
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
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
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
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
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
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
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
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