Commit Graph

97792 Commits

Author SHA1 Message Date
Gurpreet Singh
06dad4f3c2 V is 35.
It's not bromine, it's not a gauge of film: it's the next Android
release.

Set final state to "sdk" marking step-1 of finalization as complete.

Ignore-AOSP-First: Finalization is not performed in AOSP.
Bug: 335304236
Test: presubmit
Change-Id: Ifebf6ce36c5aa5c987d434085ca812f18e97ad4f
2024-04-29 13:24:25 +00:00
Zhuoyao Zhang
b5f2cdff9d Merge "Add a Clearcut tool event logger" into main am: 836b9e1ba9 am: 9afdd66494
Original change: https://android-review.googlesource.com/c/platform/build/+/3059324

Change-Id: Iaa3944144a017e3ab0bf17526dd25559d9461ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-27 03:16:57 +00:00
Zhuoyao Zhang
9afdd66494 Merge "Add a Clearcut tool event logger" into main am: 836b9e1ba9
Original change: https://android-review.googlesource.com/c/platform/build/+/3059324

Change-Id: I9bc5ab76bad6bdf89ffb7d17f036f3f5d38a6269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-27 02:52:59 +00:00
Zhuoyao Zhang
836b9e1ba9 Merge "Add a Clearcut tool event logger" into main 2024-04-27 02:39:21 +00:00
Treehugger Robot
e16a704ab2 Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main am: 0da2fee848 am: e5748d79d5
Original change: https://android-review.googlesource.com/c/platform/build/+/3063046

Change-Id: I1abe74e827fb8dd69ef8fe88d06441068b716b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-27 01:02:29 +00:00
Zhuoyao Zhang
7b11b7106a Add a Clearcut tool event logger
Implement a binary that logs tool events to Clearcut. The binary is designed to be eventually called by the `run_tool_with_logging` script in the `envsetup.sh` script that sets up the build environment.

Only start and stop events are currently logged for each invocation.

Test: atest tool_event_logger_test
bug: 331638854
Change-Id: I9268e4cb986975ceda171204e6ce8ef1732eaeea
2024-04-27 01:01:50 +00:00
Treehugger Robot
e5748d79d5 Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main am: 0da2fee848
Original change: https://android-review.googlesource.com/c/platform/build/+/3063046

Change-Id: Ic59240df79e86169a48363a545301f11416a18f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-27 00:44:33 +00:00
Treehugger Robot
0da2fee848 Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main 2024-04-27 00:23:56 +00:00
Treehugger Robot
28b224fc9a Merge "Restrict aconfig version script to linux" into main am: 3e2f5a0df8 am: a4fe929837
Original change: https://android-review.googlesource.com/c/platform/build/+/3064402

Change-Id: I57b05eb2952f003678e731248e23abc634c6ae85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-27 00:02:34 +00:00
Treehugger Robot
a4fe929837 Merge "Restrict aconfig version script to linux" into main am: 3e2f5a0df8
Original change: https://android-review.googlesource.com/c/platform/build/+/3064402

Change-Id: Ic434834d9b793fa708a3ef0b4c634f5c5d7f58ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:44:33 +00:00
Treehugger Robot
10ea9a9335 Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c645476 am: 151043cc08
Original change: https://android-review.googlesource.com/c/platform/build/+/3063044

Change-Id: If4a06898e394a4cbfa0c93d42863863ecacd447b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:32:43 +00:00
Treehugger Robot
3e2f5a0df8 Merge "Restrict aconfig version script to linux" into main 2024-04-26 23:21:54 +00:00
Treehugger Robot
151043cc08 Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c645476
Original change: https://android-review.googlesource.com/c/platform/build/+/3063044

Change-Id: I4482f8bca3a270a1a7145be91e27904c95f4a690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:14:35 +00:00
Spandan Das
4049cdb23a Revert "Drop cmdgoals special case from prebuilt selection"
This reverts commit e18b9fee63.

Reason for revert: Likely causing build failures for go/ab/git_aosp-main-with-phones

Change-Id: If01f58908bd66c7afa42b9c96d048dfcd2d70812
2024-04-26 23:08:10 +00:00
Treehugger Robot
8e7c645476 Merge "Drop cmdgoals special case from prebuilt selection" into main 2024-04-26 22:49:14 +00:00
Spandan Das
e18b9fee63 Drop cmdgoals special case from prebuilt selection
Before trunk stable, this check ensured that `docs` and `sdk` builds
contained all the apis provided by an apex. If source apex was used, it
would use the source java_sdk_library. If prebuilt apex was used, it
would use the prebuilt java_sdk_library.

After trunk stable, all release configurations for platform development
use the everything stubs of source java_sdk_library for javac, and
exportable stubs of source java_sdk_library for sdk/docs. The exportable
stubs is aware of the enabled flags for a specific release
configuration.

Since sdk and docs builds use the exportable stubs, we can drop this
special case to use the prebuilt stubs/srcjar files.

Test: presubmits
Test: in internal, lunch cf_x86_64_phone-next-userdebug (currently uses
bt prebuilts)
Test: m docs
Test: aninja -t path docs
out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth.stubs.source/android_common/exportable/framework-bluetooth.stubs.source-stubs.srcjar;
still exists after this cl

Bug: 308188056

Change-Id: I65da9f25634f0e8c3d514a4c175f89c3e5eb9712
2024-04-26 20:50:50 +00:00
Jared Duke
a97d385b69 Restrict aconfig version script to linux
Avoid breakage on other platforms.
Bug: 336657207
Test: m

Change-Id: I167dbbe934a133e8f08f630846707870404f62fd
2024-04-26 20:22:12 +00:00
Spandan Das
9e94cd3d45 Merge "Make system_server.zip compatible with prebuilt apex builds" into main am: b951161773 am: 5d933686d3
Original change: https://android-review.googlesource.com/c/platform/build/+/3062109

Change-Id: I3a121e738d01af6dfab449d5ed7c9f92f39e7686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 20:07:58 +00:00
Treehugger Robot
5069090699 Merge "Use a version script for libaconfig_storage_read_api_cc" into main am: d2469987ce am: 27ec7daf9a
Original change: https://android-review.googlesource.com/c/platform/build/+/3062145

Change-Id: I0bcf4592b0304253e8e200aa2d271a93bce6ae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 20:07:42 +00:00
Spandan Das
5d933686d3 Merge "Make system_server.zip compatible with prebuilt apex builds" into main am: b951161773
Original change: https://android-review.googlesource.com/c/platform/build/+/3062109

Change-Id: I87f03670246404f0ee68d2eb14749f7e67f70ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 19:53:20 +00:00
Treehugger Robot
27ec7daf9a Merge "Use a version script for libaconfig_storage_read_api_cc" into main am: d2469987ce
Original change: https://android-review.googlesource.com/c/platform/build/+/3062145

Change-Id: I6c13cca1df8300b0108e2d8ba23970863953945b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 19:53:05 +00:00
Spandan Das
b951161773 Merge "Make system_server.zip compatible with prebuilt apex builds" into main 2024-04-26 19:47:16 +00:00
Treehugger Robot
d2469987ce Merge "Use a version script for libaconfig_storage_read_api_cc" into main 2024-04-26 19:35:54 +00:00
Jeff DeCew
72ed8e5ab2 Merge "Generate CustomFeatureFlags" into main am: cfd7b0df36 am: 01b7c65db8
Original change: https://android-review.googlesource.com/c/platform/build/+/3058402

Change-Id: I3c96c201246eacaaa450f273b41ad3cb9042a254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 19:27:41 +00:00
Jeff DeCew
01b7c65db8 Merge "Generate CustomFeatureFlags" into main am: cfd7b0df36
Original change: https://android-review.googlesource.com/c/platform/build/+/3058402

Change-Id: I4d9eef66dd736e44fa82bd968936cfaf07bcb47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 18:53:35 +00:00
Jeff DeCew
cfd7b0df36 Merge "Generate CustomFeatureFlags" into main 2024-04-26 18:39:43 +00:00
Jared Duke
8782e1e858 Use a version script for libaconfig_storage_read_api_cc
Restrict the set of exported symbols to those in the aconfig_storage
namespace by way of a version script. This shrinks the shared lib size
by ~75%, from ~800KB to <200KB.

Bug: 336657207
Test: m
Change-Id: I56044fe667a713cf1d94f96c992f379a5725850f
2024-04-26 17:43:14 +00:00
Ben Fennema
5453308039 Merge "Allow setting --boot_variable_file in build-ota-package-target" into main am: 5e6df98fc3 am: 0d3917068f
Original change: https://android-review.googlesource.com/c/platform/build/+/3063013

Change-Id: Ia31474c737bc0402b58180cf2e85e8c5e7b46294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 17:32:47 +00:00
Ben Fennema
0d3917068f Merge "Allow setting --boot_variable_file in build-ota-package-target" into main am: 5e6df98fc3
Original change: https://android-review.googlesource.com/c/platform/build/+/3063013

Change-Id: If0ce27e09076510c76edd6f6d9e745be35478971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 17:17:21 +00:00
Ben Fennema
5e6df98fc3 Merge "Allow setting --boot_variable_file in build-ota-package-target" into main 2024-04-26 16:57:53 +00:00
Spandan Das
d22b1390b9 Make system_server.zip compatible with prebuilt apex builds
This artifact contains the system server jars that were used in the
build. At ToT, this was disabled when prebuilts were enabled to prevent
version skew between the system server jars built from source, and the
system server jars deapexed from the prebuilt apex that was installed
into the system image.

With this CL, this artifact is now compatible with prebuilts. If a
google prebuilt apex is used, system_server.zip will contain the .jar
deapexed from that prebuilt. e.g. if art _and_ btservices prebuilts are
enabled, then system_server.zip will contain the prebuilt jars for those
apexes, and sources for others.

This implementation leverages the fact that soong copies the _selected_
system server jars to out/soong/system_server_dexjars for dex2oat. Soong
is aware of source/prebuilts, and populates this directory with the
correct system server jar.

One side effect of this change is that affects the directory structure
of the zip. Previously, service-art.jar will be present in the zip file
at apex/com.android.art/java/service-art.jar. After this change
service-art.jar will be present in the top-level directory of the zip

Bug: 308188056
Test: the zip is not bit-identical, but I checked that the file contents are indentical (discussed below)
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.before
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.after
Test: find system_server.before/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: find system_server.after/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: the shasums are identical

Test: in internal, lunch cf_x86_64_phone-next-userdebug (next uses bt
prebuilts)
Test: m nothing
Test: aninja -t path out/target/product/vsoc_x86_64/system_server.zip <vendor_dir_path>/BluetoothGooglePrebuilt/com.google.android.btservices.apks; path exists

Change-Id: I213150b7ee2b012fd649b308f3c72bebf5ca7bf8
2024-04-26 16:43:52 +00:00
Ben Fennema
f089d9a587 Allow setting --boot_variable_file in build-ota-package-target
For ota generation via build-ota-package-target, match how
--oem_settings works, but for --boot_variable_file.

Bug: 335732867
Test: Set BOOT_VAR_OTA_CONFIG, make dist, and check ota_metadata
Change-Id: I526e2b280eb288f3abaace2a5daac97a0f7ac6d7
2024-04-26 08:38:08 -07:00
Michael Wright
3b1e109b1d Merge "check-flagged-apis: parse classes" into main am: 527363c906 am: 68dcf07bc7
Original change: https://android-review.googlesource.com/c/platform/build/+/3063765

Change-Id: Id54b9aae66c2f46976ba6cc150c50aff81c6a9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 13:22:58 +00:00
Michael Wright
0fadb8baf3 Merge "check-flagged-apis: add missing requireNotNull" into main am: d71cd85c0a am: 8a25575172
Original change: https://android-review.googlesource.com/c/platform/build/+/3063764

Change-Id: Ic10ff1e68ff5561c8b7e9709ba69fe4617444559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 13:22:40 +00:00
Michael Wright
68dcf07bc7 Merge "check-flagged-apis: parse classes" into main am: 527363c906
Original change: https://android-review.googlesource.com/c/platform/build/+/3063765

Change-Id: Id5a295800a306158627b61f675c561c290204b88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 13:03:19 +00:00
Michael Wright
8a25575172 Merge "check-flagged-apis: add missing requireNotNull" into main am: d71cd85c0a
Original change: https://android-review.googlesource.com/c/platform/build/+/3063764

Change-Id: I6d3e6527e8193830b977dcb0def77c8d95455f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 13:02:25 +00:00
Michael Wright
527363c906 Merge "check-flagged-apis: parse classes" into main 2024-04-26 12:48:21 +00:00
Michael Wright
d71cd85c0a Merge "check-flagged-apis: add missing requireNotNull" into main 2024-04-26 12:44:37 +00:00
Mårten Kongstad
18ff19a563 check-flagged-apis: parse classes
Teach check-flagged-apis to parse classes, including inner classes.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I17f65d3af55a20a1920b47f4c47fd0e92f9fa852
2024-04-26 05:58:41 +02:00
Mårten Kongstad
04e4564f49 check-flagged-apis: add missing requireNotNull
Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: Ibffafb504240c82d525105d4678983b30b70592d
2024-04-26 05:39:03 +02:00
Wei Li
5dd1e886d6 Merge "Add license metadata declarations which are moved from device/google/gs101/Android.mk." into main am: 68d63d47af am: b59a63495f
Original change: https://android-review.googlesource.com/c/platform/build/+/3062144

Change-Id: I7c151dcb458487e45b17bdb8f35d3fcb3540e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 02:27:28 +00:00
Wei Li
b59a63495f Merge "Add license metadata declarations which are moved from device/google/gs101/Android.mk." into main am: 68d63d47af
Original change: https://android-review.googlesource.com/c/platform/build/+/3062144

Change-Id: I5ac84cc18b500b7f427a2a283cd6e58e60dc72c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:57:24 +00:00
Inseob Kim
8b1aa8198f [automerger skipped] Merge "Build audio_effects.xml with Soong" into main am: ad77da348c -s ours am: 2988639439 -s ours
am skip reason: Merged-In Ia87b8dbc610a2c662523923a6a3570fa181204c6 with SHA-1 284a84b355 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3054063

Change-Id: I834ca78d10c2325dbd39ccf2edf815588b2046da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:42:07 +00:00
Inseob Kim
bd7d14146b [automerger skipped] Build audio_effects.xml with Soong am: f6ad0ce1c5 -s ours am: 5ab740f1d4 -s ours
am skip reason: Merged-In Ia87b8dbc610a2c662523923a6a3570fa181204c6 with SHA-1 284a84b355 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3054063

Change-Id: Ib5cb6f1c6822135d91607c984c4597ae043f2ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:42:03 +00:00
Wei Li
68d63d47af Merge "Add license metadata declarations which are moved from device/google/gs101/Android.mk." into main 2024-04-26 01:40:57 +00:00
Inseob Kim
2988639439 [automerger skipped] Merge "Build audio_effects.xml with Soong" into main am: ad77da348c -s ours
am skip reason: Merged-In Ia87b8dbc610a2c662523923a6a3570fa181204c6 with SHA-1 284a84b355 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3054063

Change-Id: I54359616073c33077f82176460ee1530524de113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:29:08 +00:00
Inseob Kim
5ab740f1d4 [automerger skipped] Build audio_effects.xml with Soong am: f6ad0ce1c5 -s ours
am skip reason: Merged-In Ia87b8dbc610a2c662523923a6a3570fa181204c6 with SHA-1 284a84b355 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3054063

Change-Id: I14b9a3a379b56a6e254b0950f3717a5d4a2e3bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:29:04 +00:00
Inseob Kim
ad77da348c Merge "Build audio_effects.xml with Soong" into main 2024-04-26 01:08:25 +00:00
Zhuoyao Zhang
71f3d5baf2 Merge "Define trendy_team_adte under build/make" into main am: 49b87dbdd6 am: 2b49e7287f
Original change: https://android-review.googlesource.com/c/platform/build/+/3063262

Change-Id: I70d640bfb6c53a91f8e58bfeffe0e420d8c0a60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 00:37:40 +00:00
Zhuoyao Zhang
2b49e7287f Merge "Define trendy_team_adte under build/make" into main am: 49b87dbdd6
Original change: https://android-review.googlesource.com/c/platform/build/+/3063262

Change-Id: I4f6ef6cd175eb753b4bb0eb1318141ed04b6660e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 00:22:31 +00:00