Commit Graph

9832 Commits

Author SHA1 Message Date
Treehugger Robot
0a1b4dfdaf Merge "Implement storage files in Java" into main am: 33118a7e83
Original change: https://android-review.googlesource.com/c/platform/build/+/3165076

Change-Id: I07259027a8305e11d7bb00cfe1d88d5c9e435c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 23:47:51 +00:00
Treehugger Robot
33118a7e83 Merge "Implement storage files in Java" into main 2024-07-10 23:28:37 +00:00
Ted Bauer
ba67436d0d fix: make device paths function static
Bug: 342636474
Test: m
Change-Id: Iea745c39f8ef90543015c365ead4c02ee4ff6653
2024-07-10 23:15:08 +00:00
Zhi Dou
af8a16adf0 Implement storage files in Java
This change implements storage files in java to remove the dependencies
on JNI.

Bug: 352078117
Test: atest aconfig_storage_file.test.java

Change-Id: I34438576d09d0aa31eabc60f472e71cebf1552a0
2024-07-10 22:29:47 +00:00
Michael Merg
8f0e4d216e Merge "Update ide_query script to new format" into main am: 11670f3918
Original change: https://android-review.googlesource.com/c/platform/build/+/3126015

Change-Id: I3d6c8c1f175a7c523c7b351ccaf6501280c6a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 15:54:26 +00:00
Michael Merg
11670f3918 Merge "Update ide_query script to new format" into main 2024-07-10 15:33:29 +00:00
Liana Kazanova
d94b32d8dc Merge "Revert "Mark FeatureFlags impl member as final"" into main am: d7343203b6
Original change: https://android-review.googlesource.com/c/platform/build/+/3159800

Change-Id: Ic55f83c4dd7c438289adf612a454ca39278dff36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 18:35:36 +00:00
Liana Kazanova
d7343203b6 Merge "Revert "Mark FeatureFlags impl member as final"" into main 2024-07-03 18:15:27 +00:00
Liana Kazanova
8450f57c3e Revert "Mark FeatureFlags impl member as final"
This reverts commit fca73bcad3.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/350978649. Will be verifying through ABTD before submission.

Change-Id: I65de159518597289f1e0e3902080f35970842afc
2024-07-03 17:56:12 +00:00
Treehugger Robot
4488b9762b Merge "Mark FeatureFlags impl member as final" into main am: 8d3b98e1ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2832886

Change-Id: I6608de0fa79d2719ab50b83f7aab9ca3ca9da8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 16:25:26 +00:00
Treehugger Robot
8d3b98e1ca Merge "Mark FeatureFlags impl member as final" into main 2024-07-03 15:52:13 +00:00
Jared Duke
3c0dc4d498 Merge "Reuse Java flag name constants in FeatureFlagsImpl" into main am: 1006bfbae3
Original change: https://android-review.googlesource.com/c/platform/build/+/2832882

Change-Id: I66dd841395a914bd37b5c99018a259ad484e9538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 15:12:35 +00:00
Jared Duke
1006bfbae3 Merge "Reuse Java flag name constants in FeatureFlagsImpl" into main 2024-07-03 14:53:29 +00:00
Michael Merg
0780635a45 Merge "Add prober scripts for language services features" into main am: 83f0e74924
Original change: https://android-review.googlesource.com/c/platform/build/+/3150556

Change-Id: Ic214a17904f6e4240d6b8ff799664743d44b1109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 08:30:52 +00:00
Michael Merg
83f0e74924 Merge "Add prober scripts for language services features" into main 2024-07-03 08:11:32 +00:00
Treehugger Robot
f959947939 Merge "Generate system diff between KATI and SOONG" into main 2024-07-03 04:48:21 +00:00
Jared Duke
1b6d14296e Reuse Java flag name constants in FeatureFlagsImpl
This may not matter in practice due to string inlining and interning,
but might avoid any accidental name drift/bugs in the future.

Bug: 280833463
Test: atest aconfig.test
Change-Id: I53b5b3effb577493ba708800928553c04b2fdc54
2024-07-02 22:51:05 +00:00
Michael Merg
d8a48c794a Add prober scripts for language services features
Change-Id: I8c4a39a575f7977c524cfd450cf952b20c8c2c11
2024-07-02 19:32:38 +00:00
Ivan Lozano
f359278a10 Merge "Remove allow-multiple-definitions flag." into main am: 1f053a072e
Original change: https://android-review.googlesource.com/c/platform/build/+/3155896

Change-Id: I4e492ed36b13bf43fc3f378983a3c6a8ac4e9206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 12:21:44 +00:00
Kiyoung Kim
8376b32e42 Generate system diff between KATI and SOONG
There is an effort to generate system image with Soong, but there are
some difference in installed files between Soong defined system image
and KATI defined one. This change generates diffs between installed
files from two sources.

Bug: 346873717
Test: USE_SOONG_DEFINED_SYSTEM_IMAGE=true m -j on aosp_cf_x86_64
generated diff file.

Change-Id: I25c71f88d16a4efb873c21abe70ca9c41c6423ca
Merged-In: I25c71f88d16a4efb873c21abe70ca9c41c6423ca
2024-07-02 02:22:51 +00:00
Kiyoung Kim
0e8dbd0861 Merge "Generate system diff between KATI and SOONG" into aosp-main-future 2024-07-02 02:21:23 +00:00
Ivan Lozano
16266625cc Remove allow-multiple-definitions flag.
This is no longer necessary as static linkage in Rust has been fixed.

Bug: 254469782
Test: m aconfig_storage_write_api.test.cpp
Change-Id: I6b8b36882aa521eb0412fb7da03a5eec94df81d4
2024-07-01 18:28:32 +00:00
Ivan Lozano
5a54b5cb5a Merge "Replace static_rlibs usage." into main am: 4ed15ef2fb
Original change: https://android-review.googlesource.com/c/platform/build/+/3146240

Change-Id: I2482648e776bfb3c88f4a74814cf7b19d7039d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-28 15:05:37 +00:00
Ivan Lozano
4ed15ef2fb Merge "Replace static_rlibs usage." into main 2024-06-28 14:44:49 +00:00
Kiyoung Kim
f5a52d9a4f Generate system diff between KATI and SOONG
There is an effort to generate system image with Soong, but there are
some difference in installed files between Soong defined system image
and KATI defined one. This change generates diffs between installed
files from two sources.

Bug: 346873717
Test: USE_SOONG_DEFINED_SYSTEM_IMAGE=true m -j on aosp_cf_x86_64
generated diff file.
Ignore-AOSP-First: Resolve conflict
Change-Id: I25c71f88d16a4efb873c21abe70ca9c41c6423ca
2024-06-28 12:52:07 +00:00
Treehugger Robot
93b3229679 Merge "Fix bug in ota_from_raw_img when generating multiple images" into main am: 6b8d925c91
Original change: https://android-review.googlesource.com/c/platform/build/+/3148857

Change-Id: Ife67200f77a777b4fbe02d402988fdc9c5b0bf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-27 01:37:17 +00:00
Treehugger Robot
6b8d925c91 Merge "Fix bug in ota_from_raw_img when generating multiple images" into main 2024-06-27 01:17:10 +00:00
Jared Duke
fca73bcad3 Mark FeatureFlags impl member as final
Marking the member as final for non-test scenarios allows for
optimizations that may otherwise be unavailable, and avoids ambiguity
about mutability.

Bug: 280833463
Test: atest aconfig.test
Change-Id: Ia58a04c9a57ee06d68f4dd022ace5365c65f4cf5
2024-06-26 23:08:16 +00:00
Kelvin Zhang
9ef8a02782 Fix bug in ota_from_raw_img when generating multiple images
Python argparse support for multiple arguments per flag is limited,
so we need to manually do parsing here(split by ",")

Test: generate a boot image OTA with boot and dtbo partition
Bug: 349590107
Change-Id: Ia9f7e0ab0836bddf15591a74b17a667e63080373
2024-06-26 10:15:33 -07:00
Ivan Lozano
b6288a526e Replace static_rlibs usage.
static_rlibs has been folded into the normal static_libs and
whole_static_libs properties.

Bug: 254469782
Bug: 349129702
Test: m
Change-Id: I89d260f78947c3e0fe65148177c7f98d0d0c504d
2024-06-26 01:36:26 +00:00
Treehugger Robot
5eb148bea7 Merge "Switch to static_rlibs" into main am: f8b7517b02
Original change: https://android-review.googlesource.com/c/platform/build/+/3145804

Change-Id: If623a566fec1414dafb055ad918c11023f3ab9a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 22:00:13 +00:00
Treehugger Robot
f8b7517b02 Merge "Switch to static_rlibs" into main 2024-06-25 21:57:39 +00:00
Ted Bauer
b64fdac839 Switch to static_rlibs
When a dependency takes multiple rust_ffi_static dependencies in its
static_libs, their symbols collide. Switch to static_rlibs, which
resolves the collisions. See b/349129702 for context.

Bug: 349129702
Test: m
Change-Id: I6cd2fe92629c7d44e22d113795b340e06175f008
2024-06-25 17:21:40 +00:00
Treehugger Robot
4dfe15c293 Merge "flush mmap file to disk after updating" into main am: 78d6964fa0
Original change: https://android-review.googlesource.com/c/platform/build/+/3144057

Change-Id: I0598a113d4401a92e7ba62cebf6c61844d48247f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 22:47:29 +00:00
Zhi Dou
436f1368cd flush mmap file to disk after updating
The change was applied in the file in memory. Without explicitly calling
msync, there is no guarantee that the changes are written back to disk.
Thus the flag value may not be changed.

Bug: b/348693143
Test: atest aconfig_storage_write_api.test.cpp
aconfig_storage_write_api.test.rust

Change-Id: I8b1e0cbbb90bcb3c2e5bbf418a6a1a9cd047c81b
2024-06-24 21:14:52 +00:00
Treehugger Robot
e507bfb45c Merge "Fix a bug in the releasetools common.py script." into main am: 4c47a8925e
Original change: https://android-review.googlesource.com/c/platform/build/+/3142279

Change-Id: I83bcb9d5eac295f1a390679854fb9b7ffb778e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-22 00:13:30 +00:00
Jooyung Han
972804b81e Fix a bug in the releasetools common.py script.
The script was not breaking out of the loop when a handler was found, which could lead to multiple handlers being called for the same option.

This fixes the issue that a single option can be handled in two handlers.

Bug: 345402175
Test: sign_target_files_apks -k ..
Change-Id: I9f4ef801df99a4a0f2ba5be994b3f37fbedc22c0
2024-06-21 22:42:48 +00:00
Zhuoyao Zhang
36299a7739 Merge "Support uploading host_name info in the tool event logger" into main am: 259215a025
Original change: https://android-review.googlesource.com/c/platform/build/+/3141987

Change-Id: I131ba0447f7b8964bdcb0fcede34c52fb9d71f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 22:26:11 +00:00
Zhuoyao Zhang
d067588a26 Support uploading host_name info in the tool event logger
host_name info is useful in several use cases including
1) to distinguish the concurrent tool invocations from the same user.
2) to understand the potential different performance from different hosts (e.g. local workstation VS cloudtop).
3) required to integrate the tool event log with the EPR system.

Test: atest tool_event_logger_test
Bug: 348482213

Change-Id: I98422b3f8ccec73d57fcdcdedac91780c448dc47
2024-06-21 21:03:03 +00:00
Xin Li
c5b3759ccf Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future 2024-06-20 20:31:51 +00:00
Jakub Czapiga
9de3473305 Merge "Drop legacy vboot support." into main 2024-06-19 07:32:35 +00:00
Xin Li
1a409255f2 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I23b7f7e8a1b43bbd5f49012c95a130d91098f92a
Change-Id: I72f3cb19133b7bd0e54a0ff7ca64cf70df2da057
2024-06-18 14:21:23 -07:00
Treehugger Robot
8715d314e6 Merge "Support license information in SBOM writers library." into main 2024-06-18 20:41:52 +00:00
Wei Li
c6b4046787 Support license information in SBOM writers library.
Bug: 324465531
Test: CIs
Test: atest --host sbom_data_test sbom_writers_test
Test: build/soong/tests/sbom_test.sh
Change-Id: Iac2be2e65f308caabb11237e72dbdc6b047cfd55
2024-06-18 12:34:30 -07:00
Jakub Czapiga
31f6e08fc9 Drop legacy vboot support.
Bug: 291329969
Bug: 347885843
Bug: 347899892
Test: m
Test: CIs
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5071b95a067c9392b7bfa4d95957307ff0ccdcc3)
Merged-In: I5f30f63553cc2670650897e259ba51baf8ced05d
Change-Id: I5f30f63553cc2670650897e259ba51baf8ced05d
2024-06-18 15:40:14 +00:00
Treehugger Robot
bb4e87008f Merge "aflags: Ensure <partition>/aconfig_flags.pb exists before reading" into main 2024-06-18 15:27:36 +00:00
Luca Stefani
bc962db1ea aflags: Ensure <partition>/aconfig_flags.pb exists before reading
In some build targets/combinations aconfig_flags.pb
may not be generated.

For example in GSI only system/aconfig_flags.pb exists
and system-only updates won't have vendor/aconfig_flags.pb.

Test: m, aflags
Change-Id: I136345a8748bc6d80bd98e673f90e0a2ab380ab1
2024-06-18 06:59:52 +00:00
Ted Bauer
6e11172c6b Add defaults target for shared linking
Add a defaults target that all targets linking to aconfig codegen with
the new storage API dependencies will need. The target takes the new
storage APIs conditionally behind a flag, so we can disable it easily.

In this topic, we add it to a single target to see that it builds and
adds the dependency. In follow-on CLs we can add it to the rest of the
targets.

Test: m audiopolicy_tests
Bug: 347701310
Change-Id: I67643205b283301f72c5466401060212b637388f
Merged-In: I67643205b283301f72c5466401060212b637388f
2024-06-17 21:16:51 +00:00
Xin Li
3ab9f3fdb9 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:26 +00:00
Ted Bauer
5223a70887 Add root check to aflags
aflags scans the apex/ dir, which requires root access to read.
Currently the command fails with "Error: Permission denied", which
doesn't tell the user how to fix the problem. This CL adds a more
descriptive error message.

Test: adb unroot && adb shell aflags list
Bug: 347692127
Change-Id: I98a7a1ba10ef52ec47035816fa66119ea84f281d
2024-06-17 15:25:02 +00:00