Commit graph

93162 commits

Author SHA1 Message Date
Treehugger Robot
c5b4b824ae Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main 2024-01-13 22:12:12 +00:00
Roshan Pius
dbaddabffb build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:046c1816091f9150c91953b8571dc946b0a59f86)
Merged-In: Ib2170146d07763ff6c852ce810497ebe1ac2eead

Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:17:26 -08:00
Jihoon Kang
d6c7dadbb5 Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main 2024-01-12 23:50:37 +00:00
Dennis Shen
c39f3781b8 build system to create flag storage files per partition
Add make file targets to create storage files. Note the container field
to aconfig command is an empty string for now as flags now by default
assumes empty container string in parsed_flag proto. Need to update it
once the container specification to aconfig files are done.

Bug: b/312239352
Test: m
Change-Id: If7bd12be5917a4779047633c00f88166574bfe0b
2024-01-12 20:21:21 +00:00
Luca Farsi
212d38662b Add dexpreopt option to build commands
Missed passing down the WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
option in the build commands.

Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64
--target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only --dist_dir <dist_dir> --change_info <change_info_file> <extra_targets>
Bug: 314171817

Change-Id: I0424e8b7ef350b3baff76ff9bcb8255c914fee5a
2024-01-12 11:24:25 -08:00
Dennis Shen
12eacc1e4e Merge "aconfig: create flag value file" into main 2024-01-12 18:37:53 +00:00
Luca Farsi
f88ce5a619 Merge "Add a script to optimize Test Mapping builds" into main 2024-01-12 18:13:15 +00:00
Treehugger Robot
45db966e90 Merge "aconfig: update cache arg to support multiple cache files" into main 2024-01-12 14:28:19 +00:00
Dennis Shen
d4ea260758 aconfig: create flag value file
Create flag_value module to create flag value file. Flag value file
contains a header section at the start of the file, followed by a
boolean array.

Bug: b/312243587
Test: atest aconfig.test
Change-Id: If76660189d63073fbd477e1e447240e0cd029604
2024-01-12 13:44:51 +00:00
Alice Ryhl
f145aaeee7 Add kcmdlinectrl to base system
Add a binary for controlling the kcmdline message for the bootloader to
the base system. The binary is similar to mtectrl, which is also listed
in this file.

Test: Verified that a custom bootloader is able to read the data
Bug: 278052745
Change-Id: I5f13a9bdff940517cb7b880815dfb8f396fc3844
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
2024-01-12 13:42:24 +00:00
Treehugger Robot
375cb9ab07 Merge "aconfig: Print flags with namespace, and sort them" into main 2024-01-12 04:31:30 +00:00
Treehugger Robot
a2fc52954e Merge "Remove last reference to SOONG_COLLECT_JAVA_DEPS" into main 2024-01-12 04:28:49 +00:00
Jihoon Kang
e0f37a7511 Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong
This change exports the build flag RELEASE_HIDDEN_API_EXPORTABLE_STUBS
so that it can be utilized in the bp file.

Test: m nothing
Bug: 315027929
Change-Id: I7b7b2658498ef8a84eb2de428c0c78b0f2215704
2024-01-12 01:11:11 +00:00
Luca Farsi
5717d6f2db Add a script to optimize Test Mapping builds
Move the test build command to a script that lives in-source and
intended to be called by the Android CI build system.

This script optimizes the build when change information is available by
only building relevant test modules. More specifically, only 'affected'
test modules listed in Test Mapping configuration files are built.

Using this script is expected to reduce build times and generate a
smaller `general-tests.zip` file which had increased to over 30 GB.

Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64
--target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only --dist_dir <dist_dir> --change_info <change_info_file> <extra_targets>
Bug: 314171817

Change-Id: Ie2f8c066f5dd1cd13454141e55956328303fd79d
2024-01-11 16:17:36 -08:00
Dennis Shen
88ec7f624f Merge "aconfig: add flag type in flag table and remove info byte from value array" into main 2024-01-11 18:43:18 +00:00
Dennis Shen
cfb65827d8 aconfig: update cache arg to support multiple cache files
Bug: b/312243587
Test: atest aconfig.test
Change-Id: I6f5f9b5ca6e2a60b8aac9ea8bf3032b00b7af7da
2024-01-11 17:13:39 +00:00
Dennis Shen
d088650481 aconfig: add flag type in flag table and remove info byte from value
array

1, add flag type to the flag table. Before flag table only stores the
mapping from (package id, flag name) to (flag id u32). The original
intent is to do bitmasking on the top byte of flag id to indicate flag
type. Now split the flag id u32 to two u16, the first represent flag
type, the second represent flag id. So after the change, the flag table
now shows the following mapping:

(package id, flag name) -> (flag type as u16, flag id as u16)

2, originally we plan to store a info byte together with each flag
value. The info byte is used by storage service damemon to mark up the
flag status, such as if it is accepting server side flag push. After
internal discussion, it is better to just create the info bytes as
another file by storage service damemon. So that the value file is
purely a flag value array.

Bug: b/312243587
test: atest aconfig.test
Change-Id: I7f953076b4269cf786bc23723078290e5ebe10bc
2024-01-11 15:30:10 +00:00
Dennis Shen
ccec070038 Merge "aconfig: remove debug print out" into main 2024-01-11 15:02:43 +00:00
Treehugger Robot
51665cf02b Merge "Metadata tool correction: Output empty proto in case of no input" into main 2024-01-11 12:16:55 +00:00
Aditya Choudhary
f0670e89f4 Metadata tool correction: Output empty proto in case of no input
Change-Id: I85ca22574433ab164c303c1f6b0d29191e704cbb
2024-01-11 11:15:23 +00:00
Dennis Shen
25167e387f aconfig: remove debug print out
Bug: b/312243587
Test: atest aconfig.test
Change-Id: Id1bd4b5a1e60a7906908a432f58d45d2a4a56248
2024-01-10 22:55:37 +00:00
Daniel Zheng
d90afc1d98 Merge "Support configuring compression factor" into main 2024-01-10 21:06:42 +00:00
Almaz Mingaleev
e882108ee5 Merge "Use tzdata's flag in PRODUCT_PACKAGES." into main 2024-01-10 14:36:11 +00:00
Cloud You
0dbd877e5f Fixed not mapping sdk_sandbox key to vendor key
Some apps are signed with default sdk_sandbox key.
It results in failure of GtsPackageSignatureTest

Bug: 318798881
Test: run gts -m GtsPackageSignatureTest
Change-Id: I676f48eb2844866f4e61af60d78026a87303d15a
2024-01-10 15:12:39 +08:00
Daniel Zheng
a567eae9ad Support configuring compression factor
With the introduction of variable block sized compression. We want
ota_from_target_files to support a flag that confgures the max block
size for compression. This flag will be passed to delta_generator and
then used fro cow estimation + ota installation

Removing a function here as it looks like it's unused. We can modify the
specified values with ModifyTargetFilesDynamicPartitionInfo(). The other
function looks like it's just a wrapper.

Test: ota_from_target_files.

Change-Id: Ia17bf62d40f947ef1fbe543886f04d10acd5bcc9
2024-01-09 16:52:20 -08:00
Almaz Mingaleev
4e3ae61b0c Use tzdata's flag in PRODUCT_PACKAGES.
Bug: 319103072

Test: m
Test: ls -l /apex/com.android.tzdata
Change-Id: I2499473e9bf324eb2950b774862c46a2b0a5fcf7
2024-01-09 11:01:37 +00:00
Colin Cross
4637dafb94 Remove last reference to SOONG_COLLECT_JAVA_DEPS
SOONG_COLLECT_JAVA_DEPS was uncondtionally enabled in
If30ad5dbabb6709f834134cbc9a513a9bdc9d9de, remove the conditional
check for disting the results.  The prevents rerunning Make analysis
in ASfP, which is setting SOONG_COLLECT_JAVA_DEPS=true.

Test: builds
Change-Id: Ibecbeeefda3fec43c8a54b5ff80835e331bab1fc
2024-01-08 14:28:48 -08:00
Fabián Cañas
3939d1ca59 Merge "Fix numeric selection from lunch menu" into main 2024-01-08 19:06:02 +00:00
Wei Li
2b54123029 Merge "Add a package in the SBOM of framework_res.jar." into main 2024-01-08 18:53:35 +00:00
Wei Li
0268764c0e Add a package in the SBOM of framework_res.jar.
Bug: 303906275
Test: m layoutlib dist
Change-Id: Ie7a0b97173643fc2cafbd9c7e5c6618ad9c68aeb
2024-01-08 09:34:42 -08:00
Dennis Shen
9b5d19bdff Merge "aconfig: create flag.map storage file" into main 2024-01-08 17:30:39 +00:00
Dennis Shen
01fca9877b Merge "aconfig: update storage unit test case" into main 2024-01-08 17:30:39 +00:00
Treehugger Robot
868f3e8dba Merge "aconfig: simplify is_valid_container" into main 2024-01-08 17:28:19 +00:00
Mårten Kongstad
32c6ef5e25 aconfig: simplify is_valid_container
str::split always returns at least one item (the entire string) if the
delimiter is not found. Simplify the implementation of
is_valid_container accordingly.

Bug: N/A
Test: atest aconfig.test
Change-Id: I3e92035309a7b019912710e42e69f9bdfa538795
2024-01-08 17:26:59 +01:00
Treehugger Robot
0f2e089f97 Merge "aconfig: remove trailing whitespace in test input" into main 2024-01-08 14:53:47 +00:00
Treehugger Robot
12a43e495e Merge "aconfig: Cargo.toml: remove obsolete dev-dependencies" into main 2024-01-08 14:38:27 +00:00
Virajitha Daibala
779c960d9e Remove unnecessary calling of PayloadGenerator
PayloadGenerator object is created twice, introduced in:
1f93ce20c5

Remove this extra call.

Test: atest --host releasetools_test
Change-Id: I7701542f7f53c9295a44fc23f634d863ab4cfc52
2024-01-08 14:30:00 +01:00
Mårten Kongstad
36d3edbf1a aconfig: remove trailing whitespace in test input
Bug: N/A
Test: atest aconfig.test
Change-Id: I248acae172fdeeb9ab9c4bb922f36b560cb44787
2024-01-08 10:07:04 +01:00
Mårten Kongstad
ca1e7c3e06 aconfig: Cargo.toml: remove obsolete dev-dependencies
The itertools crate was initially added as a dev-dependency. A later CL
also added it as a regular dependency, rendering the dev-dependency
obsolete. Remove it.

Bug: N/A
Test: cargo b
Change-Id: I12099f672f865430cf1cef97f8b4a8bc3eb055ec
2024-01-08 09:51:10 +01:00
Treehugger Robot
88b268f4b2 Merge "New LLNDK libvendorsupport.so for vendor api level" into main 2024-01-08 02:45:18 +00:00
Treehugger Robot
32fd2dee4f Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main
* changes:
  Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
  Revert "Revert "Limit System SDK to 34 for Java modules in the v..."
2024-01-06 17:53:41 +00:00
Treehugger Robot
a8becbc144 Merge "Change default lunch target" into main 2024-01-06 17:26:16 +00:00
Fabián Cañas
03dd0283bc Fix numeric selection from lunch menu
Bug: 318871826
Test: 'lunch' with no arguments, then select a lunch target with a
number.

Change-Id: I8418ef0415437548d1429ec7a2c239d8c5b615d5
2024-01-05 16:57:39 -05:00
Vladimír Marko
415fdddd98 Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main 2024-01-05 12:29:33 +00:00
Greg Kaiser
bae4c57b7b Change default lunch target
We keep this as "trunk_staging" and "eng".  However, we switch
from "aosp_arm" to "aosp_cf_x86_64_phone".  This switches us
away from 32-bit development, and gives us a project (the
cuttlefish ("cf") emulator) at the end of the build which is
runnable with reasonable performance, and able to run all 32-bit
and 64-bit tests.

Bug: 318749634
Test: lunch

Change-Id: I920cdd413cbcecd4300bc46c719e5788244a924e
2024-01-04 16:36:07 -07:00
Jiyong Park
885b004547 Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
5ef2634d5a

Change-Id: I4430ac4b2411baf3f33695ba3b1520345d7f493d
2024-01-04 23:23:38 +00:00
Jiyong Park
7a66924a60 Revert "Revert "Limit System SDK to 34 for Java modules in the v..."
Revert submission 2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS

Reason for revert: Forward fix was merged

Reverted changes: /q/submissionid:2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS

Change-Id: Ia103db05bfaebdfd301dbf84183a89d01f58eb67
2024-01-04 23:20:49 +00:00
Joey Jiao
946ca19d49 Enable clang coverage
This is to align with build/soong to support clang coverage.
- support env CLANG_COVERAGE and CLANG_COVERAGE_CONTINUOUS_MODE.
- support kill -37 signal to dump coverage.
- support build clang coverage together with hwasan.

Bug: 309894892
Change-Id: I14f75d7fdfdf872d2db3bbceb2c10d6572bcfebf
2024-01-04 13:48:33 -08:00
Sebastian Pickl
04591b6315 Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main 2024-01-04 19:30:31 +00:00
Sebastian Pickl
78c6e1368b Revert "Limit System SDK to 34 for Java modules in the vendor pa..."
Revert submission 2894701-limit_systemsdk

Reason for revert: might be breaking builds at 318695834

Bug: 318695834

Reverted changes: /q/submissionid:2894701-limit_systemsdk

Change-Id: Idfaec65ddfbb0091672993d6c857a06e9cfdfb13
2024-01-04 19:28:02 +00:00