Commit graph

85374 commits

Author SHA1 Message Date
Alex Buynytskyy
4a35600b7f Merge "Ignore invalid vndk snapshot versions" into main 2023-08-18 17:51:23 +00:00
Treehugger Robot
9ef5b821a0 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main 2023-08-18 15:24:37 +00:00
Justin Yun
a5e5151af8 Ignore invalid vndk snapshot versions
Device targets may set PRODUCT_EXTRA_VNDK_VERSIONS to include invalid
snapshot versions with the trunk-stable next configuration.
Ignore those versions that are less than or equal to the
PLATFORM_VNDK_VERSION.

Bug: 296488609
Test: lunch cf_x86_64_phone-next-userdebug; m nothing
Change-Id: I2ba9d7f41a0d75db034b1c08d15f2796ef9ed506
2023-08-18 17:59:04 +09:00
Vinh Tran
73b4f2d4e2 Merge changes from topic "rust_aconfig-test-mode" into main
* changes:
  Add rust_test with rust_aconfig_library in test mode
  Fix rust aconfig test
2023-08-17 14:48:37 +00:00
Dennis Shen
f3ef7363a2 Merge "Update codegen to use single channel in sys prop" into main 2023-08-17 14:29:06 +00:00
Dennis Shen
b352b9d33f Update codegen to use single channel in sys prop
Update sys prop name from persist.device_config.<namespace>.<flag> to persist.aconfig_flags.aconfig_flags.<namespace>.<flag>

Bug: b/295379636
Change-Id: I78f00daa574dc016902dce4b9b4ec961f973693c
2023-08-17 13:48:42 +00:00
Treehugger Robot
ef9ba4d22b Merge "Check device's launch API level before using new compresison algo" into main 2023-08-17 00:35:36 +00:00
Alex Buynytskyy
7109fe1822 Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main 2023-08-16 21:27:21 +00:00
Kelvin Zhang
8f83000732 Check device's launch API level before using new compresison algo
If a T launch device later changes to LZ4(which is supported since U),
we will fallback to older compression algorithms, because if the full
OTA is applied on an T build, the update_engine on device won't support
lz4.

Bug: 295989519
Test: generate full OTA for T launched devices, make sure lz4 is not
used

Change-Id: I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5
2023-08-16 13:16:48 -07:00
Jared Duke
7e730893f1 Merge "Add global rule for -keepattributes Exceptions" into main 2023-08-15 17:45:57 +00:00
Jared Duke
3f2741215f Add global rule for -keepattributes Exceptions
R8 full mode requires an explicit keep rule for keeping attributes for a
given target (class/method/member). As such, we can set the global rule
for keeping these attributes with minimal cost while reducing the
maintenance burden for adding incremental keep rules.

For a typical Android build, this adds <20KB total to the image.

Bug: 215530220
Test: m
Change-Id: Iad3de32e27da0ca93b618d8a203ee65bae0bb5d1
2023-08-15 15:48:35 +00:00
Ming-Chen Chung
c2038e8e3d Merge "Add update_device to be built and be packaged into otatools.zip." into main 2023-08-15 01:55:05 +00:00
Cole Faust
26acac7287 Merge "Rename some variables in definitions.mk" into main 2023-08-15 00:30:15 +00:00
Cole Faust
8e4024c872 Rename some variables in definitions.mk
Sublime text has an issue with their syntax highlighting, where it
looks for \s*define\b to indicate the start of a define block.
We had some variables that started with "define-", which match this
regex, which causes Sublime to be confused about where the defines
start and end. Rename the variables to work around this issue.

Test: m nothing
Change-Id: I997929606e2b0a8b086ad3b67a7ce1b5e99a7385
2023-08-14 15:28:05 -07:00
Joe Onorato
23a778b361 Merge "Give an error when trying to build "next" targets" into main 2023-08-14 20:59:03 +00:00
Juan Yescas
dfa43734ac Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main 2023-08-14 17:56:55 +00:00
Treehugger Robot
66f7958fbf Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main 2023-08-14 16:04:20 +00:00
Zhi Dou
5f81b7dc96 Merge "aconfig: add default-permission argument for create-cache command" into main 2023-08-14 14:12:27 +00:00
Vinh Tran
906405f5c9 Add rust_test with rust_aconfig_library in test mode
Using test mode in aconfig  allows us to override the flag for unit
testing

Test: atest aconfig.test_mode.test.rust
Change-Id: I890fb20fd8cf83e6033defc7093430e3a77e4de4
2023-08-11 21:41:13 +00:00
Yu Liu
50b31493f7 Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main 2023-08-11 21:40:01 +00:00
Vinh Tran
36fcf63c4e Fix rust aconfig test
Test: atest aconfig.test.rust --start-avd
Change-Id: Ife50e8f81999042b8af91828f5682e84fc7b3811
2023-08-11 17:36:15 -04:00
Yu Liu
affd00883f Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL.
Bug: 289380707
Test: CI
Change-Id: Id201bda1bd4acfc6cadada982e20dee19d8c703a
2023-08-11 12:59:45 -07:00
Juan Yescas
24b02ed724 core: ARM 32-bit targets must be built with 4k elf alignment
- ARM 32-bit targets will be built with 4096 ELF alignment.
- ARM 32-bit targets will only support 4K Page sizes.
- ARM 32-bit targets won't be page agnostic.

Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone
      m
Bug: 295550555
Change-Id: I1fda20ee06759cfe30e2e244616456d1ffa5ad66
2023-08-11 11:50:28 -07:00
Wei Li
1c263eb85a Merge "Add SBOM metadata for symlinks in root directory so they can be included in product SBOMs." into main 2023-08-11 18:38:12 +00:00
Juan Yescas
8358604c42 Merge "core: Rename product variable Device_page_size_agnostic" into main 2023-08-11 05:45:44 +00:00
Wei Li
517a13216e Add SBOM metadata for symlinks in root directory so they can be included in product SBOMs.
Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Change-Id: I06e6716536c034dee3f6aa03469ad9ccc587dbd5
2023-08-10 18:11:06 -07:00
Zhi Dou
24a0b6a20c aconfig: add default-permission argument for create-cache command
Aconfig set flag default permission as READ_WRITE regardless of the
release configuration. This change enables the caller of create-cache to
set the default permission for all flags, if the flag doesn't have a
value.

Test: atest aconfig.test
Bug: 294417368
Change-Id: I1ba19e1ba793cd2ae59923b136b9b50a92315ece
2023-08-10 21:39:59 +00:00
David Iserovich
71d650c252 Merge "[config] Dist supports custom super image script" into main 2023-08-10 21:34:12 +00:00
Ming-Chen Chung
ee3a191656 Add update_device to be built and be packaged into otatools.zip.
Change-Id: Ifd204a0d67815e4a443eb6c34c4545b2484bdf57
2023-08-10 19:57:58 +00:00
David Iserovich
babdafe97e [config] Dist supports custom super image script
Some boards need to supply a custom super image script, and this
is supported via the BOARD_CUSTOM_BUILD_SUPER_IMAGE variable.

However, this variable is not used by img_from_target_files.py.

Change img_from_target_files.py to call the supplied script.

Bug: None
Change-Id: I6bca937534f58459d3419139ee7a37a10138ab8f
2023-08-10 18:12:44 +00:00
Dennis Shen
908aba1147 Merge "Add rust_test for aconfig" into main 2023-08-10 17:10:29 +00:00
Greg Kaiser
f5eaf3cff3 Give an error when trying to build "next" targets
The "next" targets aren't supported yet, so we want to fail
immediately.

If the environment variable TESTING_TARGET_RELEASE_NEXT is
set, then we'll allow a "next" build, so folks can work on
fixing this in the meantime.

Bug: 294161396
Test: "lunch mokey-next-userdebug" with and without TESTING_TARGET_RELEASE_NEXT set
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f40be02ee51dec1bd5cdf88a4419684585ef6ef3)
Change-Id: If478a4efef937a0a986bfefdb61cc25921863b25
2023-08-10 16:26:12 +00:00
Kiyoung Kim
a329e3b8ff Install llndk.libraries.txt when VNDK is deprecated
llndk.libraries.txt is currently installed within VNDK APEX, while all
libraries are placed in system image, and list is still valid when VNDK
is deprecated. This change adds llndk.libraries.txt into the system
image, when VNDK is deprecated.

Bug: 290160925
Test: aosp_cf build succeeded with llndk.libraries.txt in the system
image

Change-Id: I3d5d22dbbc870a59c03fd2e3d0fad54c93f8751e
2023-08-10 17:28:05 +09:00
Wei Li
1c950f7a76 Merge "Include flags files in product SBOM." into main 2023-08-09 21:28:54 +00:00
Daniel Zheng
31694e3f83 Merge "Adding option to configure compression level" into main 2023-08-09 20:03:44 +00:00
Zhi Dou
de521a1bbe Merge changes from topic "fakefeatureflagsimpl" into main
* changes:
  Add setFlag and resetAll in FeatureFlags test mode
  Generate FakeFeatureFlagsImpl in test mode
2023-08-09 19:39:04 +00:00
Juan Yescas
d94d6bc9ad core: Rename product variable Device_page_size_agnostic
The product variable Device_page_size_agnostic will be
renamed to DevicePageSizeAgnostic.

Test: source build/envsetup.sh
      lunch aosp_cf_arm64_phone_pgagnostic
      m
Bug: 289419664
Change-Id: I4c0026a559ca3d848ccad285a5516a56d01c0efb
2023-08-09 09:04:43 -07:00
Devin Moore
aea0819fc7 Merge "Let assemble_vintf create the output fragments" into main 2023-08-09 15:29:05 +00:00
Zhi Dou
a7200115c5 Add setFlag and resetAll in FeatureFlags test mode
Add methods setFlag and resetAll in FeatureFlags in test mode. For the
injection usecase, user will use the interface FeatureFlags in the code
to control the flags.

Add tests for test mode.

Bug: 280833463
Test: Atest AconfigJavaHostTest --host
Change-Id: Ib59ba35a9011a6400af42fc9c283d37193577997
2023-08-09 01:14:57 +00:00
Wei Li
9b4cf43335 Include flags files in product SBOM.
Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Change-Id: Ifcb2f26044c346c54e60d1d4fb85fc4001f64210
2023-08-08 17:26:49 -07:00
Treehugger Robot
8c656ae6f8 Merge "Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS." into main 2023-08-08 23:43:06 +00:00
Vinh Tran
4559309aaf Add rust_test for aconfig
Test: atest aconfig.test.rust
Change-Id: Ic1b201d05fb216c8d881667461e7750949752b4a
2023-08-08 21:25:22 +00:00
Wei Li
604ab2f175 Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS.
Bug: 294786322
Test: banchan com.android.adbd com.android.adbd module_arm64 userdebug && m sbom
Change-Id: I60c403d530299741d6250b816095eafedf5bcd3d
2023-08-08 13:59:55 -07:00
Zhi Dou
5aaeee3749 Generate FakeFeatureFlagsImpl in test mode
Before FeatureFlagsImpl will be used as a fake for testing. This change
adds new class FakeFeatureFlagsImpl. The FeatureFlagsImpl will keep the
same as production. FakeFeatureFlagsImpl can be used as fake for
testing.

FakeFeatureFlagsImpl, and FeatureFlagsImpl will be generated in both
test and prod mode. In test mode FeatureFlagsImpl will just be a stub,
and in prod mode FakeFeatureFlagsImpl will just be a stub.

Bug: 280833463
Test: atest aconfig.test
Change-Id: I11c1e716a9ea00d55600e5e9d5fb6442420762e6
2023-08-08 20:35:18 +00:00
Treehugger Robot
cadce2a071 Merge "Clean up after ourselves in the Rust Benchmark Template" into main 2023-08-08 18:02:48 +00:00
Jim Shargo
980052abf6 Clean up after ourselves in the Rust Benchmark Template
There's a compliance check for tradefed that ensures that configs for
tests are set to cleanup after themselves. See: https://cs.android.com/android/platform/superproject/main/+/main:tools/tradefederation/core/javatests/com/android/tradefed/presubmit/GeneralTestsConfigValidation.java;l=425-429;drc=1fb7fe35bf7c843b5bac510476d63e4c8b436a48

This causes new benchmarks to fail presubmits.

Test: CLs with rust benchmarks pass presubmits now
Change-Id: I14f64ee3343bcf9bd2d77f547dc16b9c15bf4082
2023-08-08 16:57:42 +00:00
Daniel Zheng
74955f8883 Adding option to configure compression level
Adding option to ota_from_target_files to configure compression level.
This option can be configured via the --vabc_compression_param flag.
e.g. --vabc_compression_param=gz,9 specifies gz compression algorithm
using level 9 compression

Test: ota_from_target_files
Change-Id: Ifc851faccbb3fba466d45c9695aaab322a362081
2023-08-08 08:09:15 -07:00
Dennis Song
1afb7ffec2 Merge "Remove system_dlkm from _FRAMEWORK_PARTITIONS" into main 2023-08-07 01:25:25 +00:00
Dennis Song
a380533f13 Remove system_dlkm from _FRAMEWORK_PARTITIONS
system_dlkm partition is related to GKI, so it should be
in the same category as boot image.

Test: merge_target_files \
        --path otatools \
        --framework-target-files framework-target_files.zip \
	--vendor-target-files vendor-target_files.zip \
	--output-target-files merged-target_files.zip
Bug: 294482075
Change-Id: Ie8f60d72f44d31e1bc3b556735b92ed0a2fda662
2023-08-04 07:08:17 +00:00
Treehugger Robot
196c70bf23 Merge "Adding supported compression methods" into main 2023-08-04 00:04:22 +00:00