Commit Graph

83968 Commits

Author SHA1 Message Date
Jihoon Kang
0c76cab34e Merge "Specify list_files to be built with embedded launcher" 2023-04-06 16:54:02 +00:00
Hsin-Yi Chen
ebce0d9501 Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64
Because prebuilts/abi-dumps/ndk/current contains additional ABI dumps
that are not included in the finalization process, the script copies
only the subdirectory to the finalized ABI dump directory.

Test: ./finalize-sdk-rel.sh
Bug: 276503801
Change-Id: I76287cf110323baf40035a957564a1e8f39e8015
2023-04-06 14:01:07 +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
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
aeeea61aa0 Merge "Added Document Fields to SBOM generator" 2023-04-05 20:37:04 +00:00
Treehugger Robot
42bc8b9809 Merge "Make android_certificate_directory public" 2023-04-05 19:40:51 +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
Kelvin Zhang
3aa4644117 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" 2023-04-05 16:40:36 +00:00
Juho Kim
79e77ec4b5 Merge "Revert "Copy SBOM to dist directory when running "m dist"."" 2023-04-05 07:46:42 +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
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
Treehugger Robot
70c0c6eb81 Merge "Move PRODUCT_BRAND to module_common.mk" 2023-04-04 07:11:11 +00:00
Cole Faust
d4b4420a14 Merge "Add filegroup of certificates" 2023-04-04 03:58:15 +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
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
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
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
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
90206e3493 Merge "Move adb keys creation to CI-only step." 2023-04-01 02:21:55 +00:00
Peter Collingbourne
b327befaae Merge "Make kernel prebuilts writable after copying them." 2023-04-01 00:33:43 +00:00
Alex Buynytskyy
5dfdbe12bc Move adb keys creation to CI-only step.
It's easily automatable build step, but it needs to be done way before
REL to allow enough time for manual key propagation.
As such, moving it to local step.

Bug: 243966946
Test: manual
Change-Id: I979e8500c3c0b768af30dff93c9b73ab998a0151
2023-03-31 22:20:29 +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
Bob Badour
00670e0c03 Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" 2023-03-31 15:56:17 +00:00
Bob Badour
928ee9d9f7 Revert "Updated SBOM generator module to generate JSON spdx utility bill of"
This reverts commit e97adc5db9.

Reason for revert: Roll back until the kernel manifests are updated with the spdx-tools library.

Change-Id: Ib2327862acd928ebcea0f328daecc162b46d2c78
2023-03-31 14:51:36 +00:00
Kousik Kumar
3357cf912e Make sort as part of the inner command
It turns out, in Cog workspaces, the order of files returned by "find"
command is inherently non-deterministic (they use an absl::HashMap which
intentionally tries to NOT guarantee sort order). This results in
varying order for the inner variable, which actually causes invalidation
and regeneration of the build graph (I'm guessing when "y" changes in
$(sort $(y)), it causes an invalidation in Make). Hence made the sort a
part of the inner command itself.

Tested: Ran the build with Cog and ensured graph wasn't regenerated
across reruns.
Bug: b/276397558

Change-Id: Ie772572048785793067f74c08ac3994ef6cbaa43
2023-03-31 09:57:01 +00:00
Treehugger Robot
09df4c6562 Merge "Updated SBOM generator module to generate JSON spdx utility bill of material" 2023-03-31 07:05:53 +00:00
Treehugger Robot
a4721a5e6b Merge "Create otatools build target with dist" 2023-03-31 01:12:45 +00:00
Ibrahim Kanouche
e97adc5db9 Updated SBOM generator module to generate JSON spdx utility bill of
material

Test: m compliance_sbom

Bug: 265472710
Change-Id: Iad9ddbd2abf17ff0b034f1410c55dd99051f7127
2023-03-30 23:34:32 +00:00
Dennis Shen
5acfb9c4c6 Create otatools build target with dist
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
2023-03-30 20:10:17 +00:00
Paul Duffin
31860f66c7 Merge "Prevent enabling prebuilts by default for builds that don't support them" 2023-03-30 15:29:35 +00:00
Jared Duke
f43f66335a Merge "Keep methods annotated with @JavascriptInterface" 2023-03-29 22:24:00 +00:00
Dan Albert
249bc4c034 Merge changes from topic "fix-api_levels.json"
* changes:
  Separate active codenames and preview codenames.
  Acknowledge V in AOSP.
2023-03-29 17:57:22 +00:00
Treehugger Robot
d67a345f9a Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" 2023-03-29 17:04:37 +00:00
Dario Freni
92345a1cdb Prevent enabling prebuilts by default for builds that don't support them
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7b5e2c0cea30dd084536bdc68dffdfb1c50073d)

This uses a completely separate Change-Id as the previous change was
applied to lots of downstream branches (so they contain the Change-Id
as far as the automerger is concernd) but the change got discarded due
to some merge issues. Using the previous Change-Id would cause
confusion. The title of this change was also updated as the previous
title only made sense within the larger topic to which it belonged.

Bug: 230478310
Bug: 223592962
Test: presubmit
Change-Id: Ie35ff34f4626070d1a3fe0bb3a6a999a596d0078
2023-03-29 17:11:50 +01:00
Wei Li
cf016b9621 Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" 2023-03-29 15:54:47 +00:00
Wei Li
936ae9add6 Remove unused make variable BUILDING_PVMFW_IMAGE
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
2023-03-29 07:29:54 +00:00
Treehugger Robot
f0889e28b6 Merge "remove reference to old VTS config" 2023-03-29 02:23:10 +00:00
Dan Albert
4d24cbd044 Separate active codenames and preview codenames.
Using PLATFORM_VERSION_ALL_CODENAMES (which is a bad name for
historical reasons) for discovering preview API levels doesn't work in
the narrow window where the branch's development is not for the latest
release. Create a second variable for preview codenames and expose it
to soong.

Bug: None
Test: None
Change-Id: I8c271c1d646ea8285553614c6bca944227a0e643
2023-03-28 23:25:45 +00:00
Dan Albert
2549214184 Acknowledge V in AOSP.
Development of V APIs has started, so we need to add the codename to
the build system so API developers can use it.

Bug: None
Test: treehugger
Change-Id: Ic7e77cbc9992d7a0d2959abc42ce2862232317ca
2023-03-28 23:25:45 +00:00