Treehugger Robot
3f5f02b287
Merge changes I7953020c,I960cfdb8 into main
...
* changes:
Skip metrics upload when doing benchmarks.
Fix formatting string in benchmark pretty printer
2024-01-04 00:28:49 +00:00
Zhi Dou
1280251c0f
Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main am: f7c585604a
am: d61bea8e74
am: 5c7165e3a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2889146
Change-Id: Ia00a08b8b2ff48e03937b3e8bb5e387d98857b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 00:08:29 +00:00
Zhi Dou
1e3f798257
Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main am: 758cb81194
am: e2fba1e50c
am: a23bea38d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2888606
Change-Id: I1e8f84865c37f659335229328a2282aed547c608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 00:08:16 +00:00
Zhi Dou
35f4041179
Merge changes from topic "fro" into main am: f659f75231
am: 209c4fe857
am: 782c090312
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2888806
Change-Id: I8913c9a03a6ee43db46dd67f923fcc08f29a79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 00:07:59 +00:00
Zhi Dou
4885c40bf8
aconfig: add new codegen mode force_read_only am: 1a8281ccc2
am: fc11f98b91
am: 7cffcf4029
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2887246
Change-Id: I9b2f3a19d3d0a1b8c962aeb68c48aa7417515e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 00:07:53 +00:00
Zhi Dou
f7c585604a
Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main
2024-01-03 23:00:57 +00:00
Zhi Dou
758cb81194
Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main
2024-01-03 23:00:44 +00:00
Joe Onorato
7eba158c59
Skip metrics upload when doing benchmarks.
...
metrics-uploader runs asynchronously, and causes a race condition where
the out dir can't be deleted because metrics uploader is busy in it.
Has the side effect of not polluting the local developer metrics with
benchmark runs too.
Test: treehugger
Change-Id: I7953020cd9c69fb10745facd22648f931fc94477
2024-01-03 12:38:55 -08:00
Joe Onorato
519c9dab25
Fix formatting string in benchmark pretty printer
...
Test: th
Change-Id: I960cfdb897ed140b90caa765b1be6892d2ed208e
2024-01-03 12:37:25 -08:00
Zhi Dou
5e64029bcd
aconfig: add ForceReadOnly mode to aconfig rust codegen
...
This commit adds ForceReadOnly mode to rust codegen.
Bug: 316357759
Test: atest aconfig.test aconfig.prod_mode.test.rust
aconfig.test_mode.test.rust aconfig.exported_mode.test.rust
aconfig.force_read_only_mode.test.rust
Change-Id: I4cf98a6e9fc908fc372d4e68098a516808718c57
2024-01-03 15:56:24 +00:00
Zhi Dou
e567abdf3e
aconfig: add ForceReadOnly mode to aconfig java codegen
...
This commit adds ForceReadOnly mode to java codegen.
Bug: 316357759
Test: atest aconfig.test aconfig.test.java
Change-Id: I10cd60def9ea20f7d56d87d18f680afeac61dc9d
2024-01-03 15:56:18 +00:00
Zhi Dou
8410cf4476
aconfig: add ForceReadOnly mode to aconfig c/c++ codegen
...
This commit adds ForceReadOnly mode to c/c++ codegen.
Bug: 316357759
Test: atest aconfig.test aconfig.test.cpp aconfig.test.cpp.test_mode
aconfig.test.cpp.exported_mode aconfig.test.cpp.force_read_only_mode
Change-Id: I4842dd69993fe4fc1f504358f59513cf064919d9
2024-01-03 15:56:10 +00:00
Zhi Dou
1a8281ccc2
aconfig: add new codegen mode force_read_only
...
The "force_read_only" mode is designed for libraries shared among
multiple containers for the following two scenarios where:
1. The library must be built with read_only flags or
2. Different containers requires different values for the same flags.
In this mode, the library includes only non-exported flags, adhering to
the concept that exported flags should maintain consistent values across
containers. Additionally, regardless of their original permissions, all
flags within this mode will be set to read_only.
Bug: 316357759
Test: atest aconfig.test
Change-Id: I65df39416c96404d84044a46bbcfe1bc8ce9ba8f
2024-01-03 15:53:01 +00:00
Treehugger Robot
248182c000
Merge "dist-one flag should be a boolean, not a string" into main am: 2e137a9963
am: 439b4ce7f7
am: 63a0ad00eb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2893725
Change-Id: I198d852ec5ad277c95cfbc449fca548a492ff4ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-03 03:12:42 +00:00
Treehugger Robot
2e137a9963
Merge "dist-one flag should be a boolean, not a string" into main
2024-01-03 01:31:49 +00:00
Joe Onorato
60c36ade0f
dist-one flag should be a boolean, not a string
...
Test: th
Change-Id: I99a22011518b4a7a7f506b93d6a5ac9c7c4a2ef5
2024-01-02 16:36:31 -08:00
Dennis Shen
5098a78d2e
Merge "aconfig: add assign_flag_ids function" into main am: 68570f67c1
am: 15736d6d28
am: aebe362243
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2888807
Change-Id: I4b07a911fa3a5dbe3e2d62c6e3f468be48e19c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-02 22:50:35 +00:00
Dennis Shen
ba72cc7ae1
aconfig: add assign_flag_ids function
...
Add a function to assign flag id for flags in a package. We first assert
that the flags should have been sorted by its name, then assign a u32 id
to each flag in order. Note this cl adds the function, it will be used
in later cls.
Bug: b/312243116
Test: atest aconfig.test
Change-Id: I843433305abecbe0cc78988fe23dcf35c6a03358
2024-01-02 19:00:44 +00:00
Treehugger Robot
46a161eeaf
Merge "finalization: remove 'update' scripts" into main
2023-12-27 01:51:44 +00:00
Steven Moreland
0f84e4b21c
Split finalization scripts between vFRC and sFRC.
...
This splits out the AIDL/VNDK/sepolicy stuff from the SDK
finalization. However, in CI, we still do the vFRC step
as part of the first step.
We'll probably want to do some of the following:
- (maybe) add CI for the first step - a 'fina-0' branch
- add a way to do SDK finalizatoin without VINTF finalization
because after VINTF finalization is submitted, people will
develop in-progress interfaces that aren't done yet
- a lot of VINTF finalization is still not automated, so things
like sepolicy and LL-NDK need to be added here.
Ignore-AOSP-First: b/304316873#comment10
Bug: 314010935
Test: N/A
Change-Id: I4831a14f5c5c3d757bd1d10a775d8cf4940d9a4a
2023-12-27 00:24:00 +00:00
Steven Moreland
5fe439eec2
finalization: remove 'update' scripts
...
alexbuy@ said:
please remove both update-* scripts. they were part of r&d project
that was never finished
Ignore-AOSP-First: b/304316873#comment10
Bug: 314010935
Test: N/A
Change-Id: Iecc22cc860ba67fec336adb0c5b93f51677dc9ce
2023-12-27 00:22:39 +00:00
Treehugger Robot
a0019e13a3
Merge "Allow filtering and sorting by tag in benchmark result formatting" into main am: 38fcbf3c8e
am: 43a0639a74
am: 4612afeaf8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2889109
Change-Id: I1ade3de9d373f7114032d84237b7de3e92a17739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-22 00:15:18 +00:00
Treehugger Robot
38fcbf3c8e
Merge "Allow filtering and sorting by tag in benchmark result formatting" into main
2023-12-21 22:26:54 +00:00
Joe Onorato
67c944b351
Allow filtering and sorting by tag in benchmark result formatting
...
Test: build/make/tools/perf/format_benchmarks --tags n2d-standard-128 n2-standard-80 n2d-standard-48
Change-Id: Ie4a4e36d4bc2aab50a017acbaf3ef0e23ddae958
2023-12-21 13:29:48 -08:00
Treehugger Robot
df7014c202
Merge "aconfig: adjust integration tests to correctly set flag values" into main
2023-12-21 18:56:15 +00:00
Treehugger Robot
9f6612712c
Merge "aconfig: call Vec::retain instead of Vec::retain_mut" into main am: eb1e02a098
am: 1ecbd3bb18
am: 377c95a872
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2887706
Change-Id: Ie462bb7fcb3d4c02af0c00c4ff272fcdbfd4b8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 16:10:50 +00:00
Mårten Kongstad
c761847832
aconfig: call Vec::retain instead of Vec::retain_mut
...
Replace a call to Vec::retain_mut with a call to Vec::retain instead:
the predicate used doesn't require its parameter to be a *mutable*
reference.
Bug: N/A
Test: atest aconfig.test
Change-Id: Iacd5f2ebef358ebc92ae6a1a78dd3045e44196f4
2023-12-21 10:28:34 +01:00
Mårten Kongstad
b96cca8e15
Merge changes from topic "aconfig-remove-format-aliases" into main am: 85c9c5b81a
am: ba83c9f999
am: 871830c0c3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2882368
Change-Id: I0f5849452aead03dcf2852dcc509c9b53910dc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 09:06:46 +00:00
Mårten Kongstad
3847c9d037
aconfig: remove support for --format=verbose am: ce3a299f23
am: ad4f6cb77b
am: e4e36efeeb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2882367
Change-Id: I1f2eed71175ac427e891670acf56e8aabb244379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 09:06:41 +00:00
Mårten Kongstad
467b4583c3
aconfig: remove support for --format=bool am: 3d76d1afe0
am: b12dfaffe2
am: 7045cb40a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2882366
Change-Id: I98dcd96af4acd12c9eccab44214d2365114ed880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 09:06:35 +00:00
Mårten Kongstad
0b2a2a8c19
aconfig: adjust integration tests to correctly set flag values
...
With the introduction of a root release config, the
com.android.aconfig.test flags now have their values correctly assigned.
Update the integration tests accordingly.
Bug: 317178122
Test: atest :all
Merged-In: I1acdf9442a465f20f71bcda9b15eb69058aa4b3a
Change-Id: I1acdf9442a465f20f71bcda9b15eb69058aa4b3a
2023-12-21 09:00:48 +01:00
Mårten Kongstad
eb0772c415
Merge "aconfig: adjust integration tests to correctly set flag values" into main
2023-12-21 07:46:37 +00:00
Mårten Kongstad
ad4f6cb77b
aconfig: remove support for --format=verbose am: ce3a299f23
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2882367
Change-Id: I4a0e9158e9d7a241e5728bb718c63684bf54853e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 07:43:19 +00:00
Mårten Kongstad
b12dfaffe2
aconfig: remove support for --format=bool am: 3d76d1afe0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2882366
Change-Id: Ie076345876040fe8f2167f87b51cf84759f56eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 07:43:16 +00:00
Treehugger Robot
1a76849508
Merge "Detect downgrade by checking build time for all partitions" into main am: fb5630b393
am: fb96253429
am: 6a83277968
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2878035
Change-Id: Iba7d4b196d92f779c9aaeafb182aa7a9c8ec8203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 07:25:23 +00:00
Mårten Kongstad
85c9c5b81a
Merge changes from topic "aconfig-remove-format-aliases" into main
...
* changes:
aconfig: remove support for --format=text
aconfig: remove support for --format=verbose
aconfig: remove support for --format=bool
2023-12-21 07:03:38 +00:00
Treehugger Robot
fb5630b393
Merge "Detect downgrade by checking build time for all partitions" into main
2023-12-21 05:14:54 +00:00
Dennis Shen
a87914124f
Merge "aconfig: add whole table serialization test" into main am: 6376ecee75
am: 6ffdf370bd
am: 8d9d92eb5b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2886287
Change-Id: I841943fd39a28ebdf730a6b9036e42843957f34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-21 02:27:49 +00:00
Dennis Shen
6376ecee75
Merge "aconfig: add whole table serialization test" into main
2023-12-21 00:45:35 +00:00
Dennis Shen
691c8e3615
Merge "aconfig: add additional test aconfig to test chaining" into main am: bd635ce666
am: 5b6190352b
am: 1f809d74dd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2885886
Change-Id: I0174296d3550066eeff35a4a4758bdc33d19b70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 21:47:15 +00:00
Dennis Shen
e6330986d0
aconfig: add whole table serialization test
...
1, Add whole table serialization test to also lock down how the buckets
are serialized. Before this change, we are only locking down the header
and nodes serialization.
2, Switch over to the absolute offset in the file instead of relative
offset. Before we are using relative offset. For example, if a bucket is
Some(10), it means that it is pointing to 10 bytes over the start of the
node region of the table. Now it will be the absolute byte offset with
respect to the start of the table.
Bug: b/312243587
Test: atest aconfig.test
Change-Id: If7abc8c6b6687c0bc0c40bbfc6afbe0e46ece770
2023-12-20 19:46:03 +00:00
Dennis Shen
bd635ce666
Merge "aconfig: add additional test aconfig to test chaining" into main
2023-12-20 19:45:00 +00:00
Treehugger Robot
5fa6bc05a5
Merge changes Id392a33c,Iabf8875f into main am: e1cd8461a3
am: d74d671c20
am: 2014c8fefe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2883080
Change-Id: I5eeb4f91700a0916da8911c73633fcda1034c839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 18:45:34 +00:00
Zhi Dou
9401240854
Merge "aconfig: update error message in modify_parsed_flags_based_on_mode" into main am: 9cd08c66a4
am: 9a8d7f14f6
am: 5ff5f869ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2883810
Change-Id: Ic78635b5741bc71cbeb5a790ff9465b6db47360c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 18:45:18 +00:00
Zhi Dou
13f5844393
Merge "aconfig: update codegen templates" into main am: e381a17cfc
am: f0b2dfedb0
am: bf18e8f4c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2883370
Change-Id: I7c04e66cbf6062192e0bcde4c8ad7763283d3ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 18:43:34 +00:00
Mårten Kongstad
d669fa67ed
aconfig: adjust integration tests to correctly set flag values
...
With the introduction of a root release config, the
com.android.aconfig.test flags now have their values correctly assigned.
Update the integration tests accordingly.
Bug: 317178122
Test: atest :all
Ignore-AOSP-First: submit internally first to resolve merge conflict from AOSP
Change-Id: I1acdf9442a465f20f71bcda9b15eb69058aa4b3a
2023-12-20 19:24:49 +01:00
Dennis Shen
8bab859f84
aconfig: add additional test aconfig to test chaining
...
Add an additional package com.android.acondfig.storage.test_4 to test
so that the chaining in package.map can also be tested.
Bug: b/312243587
Test: atest aconfig.test
Change-Id: I8d0fad8941a20c7f6ed60caf529667549abdcdd7
2023-12-20 17:45:00 +00:00
Treehugger Robot
beae27905e
Merge "aconfig: add missing tests to TEST_MAPPING" into main am: e1f89d9336
am: 2f1c54fa01
am: e4afa65407
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2884667
Change-Id: If93823a83361d0325f4b7d057326a415e3a9ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 17:21:51 +00:00
Ludovic Barman
1dca4e4412
Merge "Remove unused use_protobuf3 flag" into main am: d842f5d074
am: c4917d7563
am: 0528594b38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2879286
Change-Id: Icb6de4b6a2d5dd2b7d56c185b4ae55b01f2c340e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-20 17:20:30 +00:00
Treehugger Robot
e1cd8461a3
Merge changes Id392a33c,Iabf8875f into main
...
* changes:
Add --dist-one flag to the benchmark script to make it copy a single set of build metrics to a dist dir.
Add the rest of the CUJs to the new benchmark script.
2023-12-20 17:20:13 +00:00