Commit Graph

31955 Commits

Author SHA1 Message Date
Devin Moore
62d0a739bb Restrict the framework manifest check against frozen files
This only needs to be done for GSI targets that need to remain
compatible with previously frozen manifests so they continue to work for
older upgrading devices.

Test: lunch aosp_cf_x86_64_phone && m
Test: lunch aosp_arm64 && m
Test: both tests with and without android.hidl.manager served on device
Bug: 218588089
Change-Id: I34862b08cd4ba4c554b5fe9db0eeacba60a0c33a
2022-10-17 19:48:46 +00:00
Justin Yun
dd15ec1fd1 Split system and vendor unmounted notice deps
Some unmounted notices need to be included in system only but not in
vendor image. Split the unmounted notice deps to exclude system
dependent notices from the vendor image.

Bug: 243753534
Test: check notice.xml
Change-Id: I23071542ac7823caf9697463928dcd1781f9414a
2022-10-11 13:46:56 +09:00
Treehugger Robot
c6ea3aa6e0 Merge "Limit cts-api-coverage parallelism to 8" 2022-10-10 20:05:52 +00:00
Pierre-Clément Tosi
23330a0fb6 Merge "core: Get pmvfw.img partition from Soong" 2022-10-10 17:27:27 +00:00
Colin Cross
bb5bb5e242 Limit cts-api-coverage parallelism to 8
cts-api-coverage is getting OOM killed in presubmit, likely due to
spawning a copy of dexdeps in parallel for every cpu in the system.
Limit it to 8 parallel subprocesses when running inside the build,
as other processes are likely already using cpu and memory.

Bug: 252817769
Test: m out/host/linux-x86/cts-api-coverage/system-api-coverage.html
Change-Id: Iaae6561ac173d32c1b5af895cab76f3f898da4bb
2022-10-10 10:16:23 -07:00
Anton Hansson
8e7ccf0cb7 Merge "Pass docs goal to kati" 2022-10-10 09:52:24 +00:00
Anton Hansson
7b2b0b209a Pass docs goal to kati
The docs goal affects makefile parsing (android_soong_config_variables),
so it needs to be passed to kati to work properly.

Bug: 251762621
Test: TARGET_PRODUCT=sdk m docs dist (in prebuilt branch)
Change-Id: Ifa8e1e8e3a239434ac40a3edb213ed6344ceb424
2022-10-07 16:21:04 +00:00
Sorin Basca
566aa5d177 Merge "Revert^2 "Use the toolchain from JDK 17 for Robolectric"" 2022-10-07 05:10:30 +00:00
Yi-yo Chiang
0c022f3161 Merge "Assert BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true" 2022-10-07 03:47:48 +00:00
Sorin Basca
c42562f596 Revert^2 "Use the toolchain from JDK 17 for Robolectric"
This reverts commit a2578b28ab.

Reason for revert: Issues that caused the failures have been fixed.

Bug: 233029164
Change-Id: Ibde1bc6d900815072146ea291737bff701485f9d
Test: TH
2022-10-06 14:50:57 +00:00
Mark Teffeteller
13b3f240bf Merge "Add module info to Haiku builds" 2022-10-06 14:13:20 +00:00
Yi-Yo Chiang
b4bd8395bf Assert BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
Right now BOARD_BUILD_SYSTEM_ROOT_IMAGE is either empty or false.
This change stops new users from setting BOARD_BUILD_SYSTEM_ROOT_IMAGE
to true. After all remaining references (read or set to empty/false) to
BOARD_BUILD_SYSTEM_ROOT_IMAGE are removed, we can mark it as obsolete.

Bug: 241346584
Test: Presubmit build_test
Change-Id: Ie23504525ffc0f0dcad6dff81e7eddb22edffd0e
2022-10-06 19:00:04 +08:00
Xin Li
a93e7417aa Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Colin Cross
a4e13d8866 Merge "Add initial files for aosp_riscv64 target" 2022-10-05 22:03:22 +00:00
Colin Cross
dac728895d Add initial files for aosp_riscv64 target
Add barebones files to support building for a riscv64 target.

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m ALLOW_MISSING_DEPENDENCIES=true nothing
Change-Id: I61e6ecf6706b7682c77b07e6593d78c7d1eaef39
2022-10-05 12:04:31 -07:00
Jihoon Kang
529b58c8e8 Merge "Create partition-specific symlink for jnilib install" 2022-10-05 16:19:51 +00:00
Mark
f7ffdac744 Add module info to Haiku builds
Test: make haiku
Change-Id: I8b3e2792f750e9aaeb2b05fee784a972118f9bd9
2022-10-05 15:49:49 +00:00
Xin Li
dc42f73ad8 Merge TP1A.221005.003
Merged-In: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
Change-Id: Ic2a8f8130a1090cd67f280418e7a6b933fe7f195
2022-10-03 13:19:15 -07:00
Ken Sun
61818c4aa9 Merge "Revert "Use the toolchain from JDK 17"" 2022-10-03 03:17:13 +00:00
Ken Sun
a2578b28ab Revert "Use the toolchain from JDK 17"
Revert "Use the toolchain from JDK 17"

Revert submission 2164342-use-jdk17

Reason for revert: DroidMonitor-triggered revert due to breakage b/250426490

Reverted Changes:
Ib1a24e7ea:Update path for libjli.so
I3375bd4e4:Use the toolchain from JDK 17
I9183e5511:Use the toolchain from JDK 17

Change-Id: Ic72662dab2e57a60272b0a82606a17974efcd982
2022-10-03 03:12:41 +00:00
Sorin Basca
71ddbf4351 Merge "Use the toolchain from JDK 17" 2022-10-02 19:36:17 +00:00
Pierre-Clément Tosi
d000004876 core: Get pmvfw.img partition from Soong
The content of the pvmfw partition can be generated using the bootimg
Soong rule, which also supports AVB-signing the image.

Bug: 237371962
Test: m pvmfwimage
Change-Id: I55f33781c5c391fcbbfde0bce23f9b0fd54739a2
2022-10-02 12:14:57 +01:00
Qing Shen
d058fc33a3 Modifies path of getting libc++ library for LLVM coverage generation, caused by upstream clang updates.
See https://b.corp.google.com/issues/236023386#comment11,  culprit CL: https://reviews.llvm.org/D126731 and https://reviews.llvm.org/D107799

Change-Id: I6eaad2d97fbd4e2b82765f8f8cbe671943754938
bug: b/249525798
2022-09-30 05:34:32 +00:00
Sorin Basca
6568b77dfb Use the toolchain from JDK 17
Bug: 233029164
Test: m
Change-Id: I9183e55117bec8b1728e8d2ce8383d086f82d117
2022-09-29 10:17:50 +01:00
Kelvin Zhang
ed714e0f24 Use shell sort command
When using builtin sort() function, make will detect changes in
the find sub-expression, and re-parse the whole makefile. Even though file
list after soring is identical. This is bad for incremental builds, as
everytime a python file is modified, the order files that gets returned
by find changes, resulting in long build time.

Test: th
Change-Id: I8cc347b4473a2b241f2f10e016e5968477c482f3
2022-09-22 12:46:36 -07:00
Bob Badour
9a76135e44 Merge "Policy change: GPL+CE is permissive." 2022-09-21 23:33:30 +00:00
Alix Espino
358fe88bf1 Merge "Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."" 2022-09-21 19:28:11 +00:00
Alix Espino
38e07f1baf Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."
Revert^2 "deletion of clang_cflags & clang_asflags from Soong"

e9a6865bc7c51028ed348f6d1c6b975ee8b98837

Test: Treehugger
Change-Id: Ibda75c075d0d88f2c11fd10722c9a74481ee965a
2022-09-21 16:45:00 +00:00
Treehugger Robot
c017139559 Merge "Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION" 2022-09-21 14:09:20 +00:00
Bob Badour
10f5c48b23 Policy change: GPL+CE is permissive.
Bug: 210546823

Test: m cts compliance_checkshare compliancenotice_bom \
    compliancenotice_shippedlibs compliance_listshare \
    compliance_dumpgraph compliance_dumpresolutions htmlnotice \
    compliance_rtrace textnotice xmlnotice

Change-Id: I7da36972ffbb1494e33fd63db8e5ec851d47704c
2022-09-20 21:50:08 -07:00
Victor Hsieh
adc94a151a Remove fs-verity build manifest for vendor/odm/product
The build manifest APKs are recently added because we thought it's nicer
for ART to support beyond system_ext for potential partner
customizations.  Jiyong pointed out that having system server JARs
outside of system and system_ext may be a Treble violation. As a result,
delete some of those files.

Bug: 246000387
Bug: 245957815
Test: m; no longer seeing the files under out/
Change-Id: I4c5b118bd2277b5f3265ac4d3c2343cf929822c5
2022-09-20 14:53:51 -07:00
Edward Liaw
cfb5fb5227 Merge "vts: split kselftests and ltp" 2022-09-20 15:00:58 +00:00
Mårten Kongstad
26ed749f14 Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION
Make PLATFORM_BASE_SDK_EXTENSION_VERSION default to
PLATFORM_SDK_EXTENSION_VERSION: they only need to be different on the
SDK extension branches.

Bug: 247413701
Test: manual install of modules
Change-Id: Iedcd9d6bce4e7346d24146b871d489255a17466c
Merged-In: Iedcd9d6bce4e7346d24146b871d489255a17466c
2022-09-20 15:42:11 +02:00
Treehugger Robot
b2bf9efa32 Merge "Only keep Parcelables if used" 2022-09-20 03:47:31 +00:00
Jared Duke
9d27a928f2 Only keep Parcelables if used
Use `-keepclassmembers` instead of `-keep` for Parcelable types
and their CREATOR members. This allows shrinking of Parcelable types
that aren't referenced while still preserving the necessary CREATOR
member when the classes are kept. This saves ~3MB across various
platform targets.

Bug: 238670321
Test: m + presubmit
Change-Id: I13508073dbc07e28aa93bb6604c8f838bcf72646
2022-09-19 16:26:44 -07:00
Yike
450197e265 Export the target_required property to module-info
Some host test modules such as `python_test_host` use the
`target_required` attribute to declare target dependencies that will
be pushed to device. For example, `aidl_integration_test` references
several target dependencies in the `target_required` attribute since
those output files will be searched and pushed to device at runtime.
Besides, those target dependencies can't be declared in the `data`
attribute instead, since some modules' `data` attribute doesn't
support multi-arch.

So that, this information needs to present in module_info.json and
exported to properly generate Bazel targets that include these
dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 222438068
Change-Id: Ia5ee103be1e7a811e1fdbd2b39252912b1a35c18
2022-09-19 16:42:04 +08:00
Edward Liaw
f867471865 vts: split kselftests and ltp
Split the location of ltp and kselftest files so that they are not
uploaded together if running individually.  Should improve the
performance of kselftest.

Bug: 190800715
Test: atest vts_ltp_test_x86_64
Test: atest vts_linux_kselftest_x86_64
Signed-off-by: Edward Liaw <edliaw@google.com>
Change-Id: I121e6d5bab8edd185c8d73ad7849dff9e8b5f118
2022-09-14 22:59:11 +00:00
Victor Hsieh
89415a8ea9 Reland: Generate fs-verity build manifst APK for other partitions
* Expand the allowlist to include {system_ext, vendor, odm,
   product}/framework/*. Generate .fsv_meta for them.
 * Add BuildManifest.apk for those partitions.
 * Rename PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to remove "SYSTEM".
 * (new in reland): add apkcerts

Bug: 245957815
Test: m
Test: ls -l $ANDROID_PRODUCT_OUT/*/etc/security/fsverity/BuildManifest.apk
Test: extract assets/build_manifest.pb from apk, inpsect
Test: run asit/ota/signing
Change-Id: I48a5e473aa5eedb24edab54357a9141fc8d78759
2022-09-14 13:19:26 -07:00
Treehugger Robot
1acd7b0438 Merge "Normalize target path for license dependencies." 2022-09-14 18:48:30 +00:00
Treehugger Robot
ebb4bfe9c9 Merge "Put host license metadata in OUT_DIR." 2022-09-14 18:45:51 +00:00
Victor Hsieh
7942ba9a1e Merge "Revert "Generate fs-verity build manifst APK for other partitions"" 2022-09-14 17:50:59 +00:00
Victor Hsieh
8c54b9a54b Revert "Generate fs-verity build manifst APK for other partitions"
Revert submission 2212483-fsverity-manifest-apk-per-partition

Reason for revert: b/246781147
Reverted Changes:
I503672571:Generate fs-verity build manifst APK for other par...
Iebc54ea44:Rename to PRODUCT_FSVERITY_GENERATE_METADATA

Change-Id: I8335b3016a52e474418fb28139c37e35e3468170
2022-09-14 17:27:40 +00:00
Treehugger Robot
e986ab2038 Merge "core: Introduce a pvmfwimage phony target" 2022-09-14 16:51:55 +00:00
Victor Hsieh
494297893f Merge "Generate fs-verity build manifst APK for other partitions" 2022-09-14 15:42:31 +00:00
Treehugger Robot
21554ab3fc Merge "Use same toolchain for RBE as non-RBE" 2022-09-14 01:06:27 +00:00
Victor Hsieh
c80519cc02 Generate fs-verity build manifst APK for other partitions
* Expand the allowlist to include {system_ext, vendor, odm,
   product}/framework/*. Generate .fsv_meta for them.
 * Add BuildManifest.apk for those partitions.
 * Rename PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to remove "SYSTEM".

Bug: 245957815
Test: m
Test: ls -l $ANDROID_PRODUCT_OUT/*/etc/security/fsverity/BuildManifest.apk
Test: extract assets/build_manifest.pb from apk, inpsect
Change-Id: I503672571741d47ba15add048c0a2f00b6b2a86d
2022-09-13 10:33:31 -07:00
Bob Badour
54b325df14 Normalize target path for license dependencies.
If not normalized the same as declare-license-metadata, two rules get
generated instead of one rule with both license text and deps.

Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
Merged-in: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
2022-09-13 17:21:40 +00:00
Bob Badour
28078172fe Put host license metadata in OUT_DIR.
Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
Merged-in: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
2022-09-13 17:20:20 +00:00
Sorin Basca
0b4d07dc51 Use same toolchain for RBE as non-RBE
Bug: 233029164
Fixes: 246271065
Test: m
Test: EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m
Test: EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true EXPERIMENTAL_TARGET_JAVA_VERSION_17=true m
Change-Id: I7962068938b16dde52e68abb3baff212deb287be
2022-09-13 14:56:32 +01:00
Treehugger Robot
fef5ca53fa Merge "Revert "Default BuildBrokenClangCFlags & BuildBrokenClangAsFlag..."" 2022-09-12 21:06:12 +00:00