Commit Graph

9756 Commits

Author SHA1 Message Date
Treehugger Robot
0d8f1bcefd Merge "Fix -Wformat in generated code." into main 2024-07-12 16:57:14 +00:00
Zhi Dou
cd39762828 Merge "add storage java reader" into main am: 6f9f7ccfe3 am: e944856ba0
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: Ie0fc2b2c15824240fd631fed9e4d43961aca51fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 14:28:05 +00:00
Zhi Dou
e944856ba0 Merge "add storage java reader" into main am: 6f9f7ccfe3
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: If1ee86dca35afb6fcc12e8c83b1934582a28176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 14:06:23 +00:00
Zhi Dou
621323cfda add storage java reader
Test: atest aconfig_storage_read_api.test.java
Bug: 349874828
Change-Id: I4b1d5ccf4d48622a88712b6e8940ffe18e980927
2024-07-12 13:34:12 +00:00
Krzysztof Kosiński
17c72281f2 Fix -Wformat in generated code.
Bug: 315250603
Change-Id: I61cddf58939d8ff6a9835426b0f04c19c820a26c
Test: presubmit
Flag: EXEMPT build system fix
Ignore-AOSP-First: code is already modified internally
2024-07-12 04:54:48 +00:00
Priyanka Advani
4dcdf3e01c Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe am: c92444463b
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: I86716f83340645a1f4f2ac22acca6e19f7cae770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:55:41 +00:00
Priyanka Advani
c92444463b Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: If3cf11fa94bcfeb70fa3c30442b0ba72406be48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:36:14 +00:00
Priyanka Advani
16c8d3c47a Revert "add storage java internal reader"
This reverts commit 70b9ac0ddd.

Reason for revert: Droidmonitor created revert due to build breakages in b/352582602.

Change-Id: I8a8e38ccf3e715e9b4746ac333aed0cc13d11969
2024-07-11 19:59:24 +00:00
Zhi Dou
564901db29 Merge "add storage java internal reader" into main am: 657d68aee4 am: f9c1b73113
Original change: https://android-review.googlesource.com/c/platform/build/+/3168136

Change-Id: I0fe7c7a618ec7d851de8b47ae0c79f10e187a564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:42:47 +00:00
Zhi Dou
f9c1b73113 Merge "add storage java internal reader" into main am: 657d68aee4
Original change: https://android-review.googlesource.com/c/platform/build/+/3168136

Change-Id: I742f761e6722b49c0278960a8b6705cc8becf75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:24:45 +00:00
Zhi Dou
70b9ac0ddd add storage java internal reader
Test: n/a
Bug: n/a
Change-Id: I852ab4080bee9240549dc4be0c09dbe1f72d06b0
2024-07-11 18:50:46 +00:00
Treehugger Robot
134d33bb63 Merge "fix: make device paths function static" into main am: 0d18be30ae am: 68249a141d
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I6147d40c85369f22e60a34ae3a33bbde852c2b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 14:37:34 +00:00
Treehugger Robot
68249a141d Merge "fix: make device paths function static" into main am: 0d18be30ae
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I7fd3e74a9cd1923ee449a41f584fc7be65df718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 14:07:50 +00:00
Treehugger Robot
0d18be30ae Merge "fix: make device paths function static" into main 2024-07-11 13:48:51 +00:00
Kiyoung Kim
61698d538c Merge "Update allowlist based on internal system image" into main 2024-07-11 00:50:28 +00:00
Kiyoung Kim
7d04b4d978 Update allowlist based on internal system image
Allowlist of system image diff is generated based on the AOSP main, but this is not sufficient for internal main as it contains more items in the aosp_cf_x86_64_phone system image. This change adds more items in diff so aosp_cf_x86_64_phone build won't break from system image diff.

Bug: 346873717
Change-Id: Ic867ce1eb3f415976d37d91a201ebac0b45f0f1e
Test: aosp_cf_x86_64_phone build succeeded
Ignore-AOSP-First: Internal only feature
2024-07-11 00:47:10 +00:00
Treehugger Robot
eb2a1fe33e Merge "Implement storage files in Java" into main am: 33118a7e83 am: 0a1b4dfdaf
Original change: https://android-review.googlesource.com/c/platform/build/+/3165076

Change-Id: I34d65ba27a4c7230010848b2a957d7f000e8f696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 00:24:20 +00:00
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
455b7a5f05 Merge "Update ide_query script to new format" into main am: 11670f3918 am: 8f0e4d216e
Original change: https://android-review.googlesource.com/c/platform/build/+/3126015

Change-Id: I30d9b45a5edeb606fce6e462f639bfd36d572a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 16:12:17 +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
0dd0a908ae Merge "Revert "Mark FeatureFlags impl member as final"" into main am: d7343203b6 am: d94b32d8dc
Original change: https://android-review.googlesource.com/c/platform/build/+/3159800

Change-Id: I114f84272adf235bd9cdb81781e5cac1b3e8ebd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 19:20:34 +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
e74b8f4674 Merge "Mark FeatureFlags impl member as final" into main am: 8d3b98e1ca am: 4488b9762b
Original change: https://android-review.googlesource.com/c/platform/build/+/2832886

Change-Id: I42339ea377df896c8a658c3ddc1770023d48f8e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 16:41:54 +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
f0b0b8b710 Merge "Reuse Java flag name constants in FeatureFlagsImpl" into main am: 1006bfbae3 am: 3c0dc4d498
Original change: https://android-review.googlesource.com/c/platform/build/+/2832882

Change-Id: I4cf611f7e3798d703779c8939f053edebe9ee180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 15:32: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
739ee6527f Merge "Add prober scripts for language services features" into main am: 83f0e74924 am: 0780635a45
Original change: https://android-review.googlesource.com/c/platform/build/+/3150556

Change-Id: I01f6f854e45f439220060988dc81c7344d3cdc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 09:06:47 +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
Ted Bauer
b9b990ad75 Merge "Aconfig: update cpp codegen" into main 2024-07-02 21:01:17 +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
Ted Bauer
3b3e1a6161 Aconfig: update cpp codegen
Update cpp codegen to read from both old and new storage for RW flags.
After comparison return old storage value and add a logcat log if the
value matches between the two storage pipeline. This codegen change is
not applied to nextfood build (as it is controlled by the build time
flag RELEASE_READ_FROM_NEW_STORAGE). In addition, the additional logic
to read from new storage is guarded by a RW aconfig flag.

Bug: b/321077378
Test: m and tested on a raven device
Flag: build.RELEASE_READ_FROM_NEW_STORAGE,
com.android.providers.settings.storage_test_mission_1
Ignore-AOSP-First: will fix any incompatibilities caused by this change in git main first, and then cherry pick it back to aosp

Change-Id: I24851db965129b5a39d2c52d52b64bbafc179c7d
2024-07-01 15:34:55 +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