Treehugger Robot
d42c9deb5e
Merge "device_supported is true by default, no need to specify it." into main am: 1c8730d71c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2743415
Change-Id: I816a34d23e56ca2fc55f24e65876297cb5eec764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-06 19:00:00 +00:00
Treehugger Robot
37cc5e155c
Merge "Default device_supported and host_supported to true in serde." into main am: 210030f1af
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2743414
Change-Id: I7d0f1e26c0bf12769b8221dfa206e611f97ee141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-06 18:59:30 +00:00
Treehugger Robot
1c8730d71c
Merge "device_supported is true by default, no need to specify it." into main
2023-09-06 18:18:05 +00:00
Treehugger Robot
210030f1af
Merge "Default device_supported and host_supported to true in serde." into main
2023-09-06 18:04:52 +00:00
Andrew Walbran
a8ccd6f364
device_supported is true by default, no need to specify it.
...
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I54b6586b4b5940d0e94a2a8f4b35c267792c4842
2023-09-06 16:15:54 +01:00
Andrew Walbran
2e6cec5a0f
Default device_supported and host_supported to true in serde.
...
This is cleaner than using .unwrap_or(true) wherever they are used.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I763adf0cc51721408adf55b966ed4304e2766c00
2023-09-06 16:11:21 +01:00
Treehugger Robot
04f14bafcc
Merge "Skip UP1A.230905.019" into aosp-main-future
2023-09-05 19:54:48 +00:00
Zhi Dou
f2763482b6
Merge "Run unit test with the prod flag java lib" into main am: a4f2876d42
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2736614
Change-Id: Ie707e21a2dce57cb4e570ba55d37ffa036e39577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:14:25 +00:00
Xin Li
e16f7b3fdc
Skip UP1A.230905.019
...
Merged-In: Iccd86693424572eaf003fda9600ba7293b08a8f4
Change-Id: I15a64e2206e8d052d27b43919b6c1658f00ab2d5
2023-08-31 14:31:51 -07:00
Zhi Dou
a4f2876d42
Merge "Run unit test with the prod flag java lib" into main
2023-08-31 21:19:01 +00:00
Zhi Dou
32120e43e1
Run unit test with the prod flag java lib
...
Bug: 295561701
Test: m AconfigDemoUnitTests
Change-Id: Ib906c285ee6b4ebc04fde0e09555fb3c56453d16
2023-08-31 18:22:19 +00:00
Treehugger Robot
e449b8a7c6
Merge "Update add3prf for MetadataURLValid" into main am: 6ca8712996
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2730215
Change-Id: I24a250106970f7ee397fb384c4f43723ea039487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 06:24:20 +00:00
Treehugger Robot
6ca8712996
Merge "Update add3prf for MetadataURLValid" into main
2023-08-30 05:26:12 +00:00
Hsin-Yi Chen
96fe970374
Merge "Rename Target to Arch in header-checker utils.py" into main am: ebd7ca9041
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2728817
Change-Id: Idf7730a3d450dabbcde664e20ea2bea65b1f17c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 10:29:38 +00:00
Hsin-Yi Chen
ebd7ca9041
Merge "Rename Target to Arch in header-checker utils.py" into main
2023-08-29 10:06:40 +00:00
Hsin-Yi Chen
c90edbfa1c
Merge "Pass release configuration to create_reference_dumps.py" into main am: 3b20634c59
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2728816
Change-Id: I8b9ac49d3ba36be6c2d6eda72c056c700e73a312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 09:43:34 +00:00
Hsin-Yi Chen
beda56ad5c
Rename Target to Arch in header-checker utils.py
...
"target" refers to a target arch, a build target, or a make target.
This commit renames the class and the variables to avoid ambiguity.
Test: development/vndk/tools/header-checker/utils/create_reference_dumps.py \
-products aosp_x86_64 -release trunk_staging
Bug: 297542516
Change-Id: Icfb06e18333d56af802c74494c1d158f367026c9
2023-08-29 08:58:49 +00:00
Hsin-Yi Chen
3b20634c59
Merge "Pass release configuration to create_reference_dumps.py" into main
2023-08-29 08:57:44 +00:00
Jeongik Cha
4e8edb4a2c
Update add3prf for MetadataURLValid
...
url field has been deprecated in favor of the identifier field.
Test: check output
Change-Id: I1d642d74f51244d59de4d5c44c4b9878873dd0d6
2023-08-29 11:26:17 +09:00
Hsin-Yi Chen
0433a86ffd
Pass release configuration to create_reference_dumps.py
...
This commit adds -release as a parameter to create_reference_dumps.py.
It is currently optional. Developers can use it to try different
release configurations.
Test: development/vndk/tools/header-checker/utils/create_reference_dumps.py \
-products aosp_x86_64 -release trunk_staging
Bug: 297542516
Change-Id: Ifb7001ed42dbb9f8d0dd8e6c9738be6d5ea2feca
2023-08-28 08:06:13 +00:00
Xin Li
c48ca52981
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: I3ecaaa93a89703a6c3d20c81210f7c6683c145fb
Change-Id: Ib5819377b7aad20e03ca639b4e65172fefe0b512
2023-08-25 13:42:52 -07:00
Zoe Tsou
77e3380629
Merge "Implement N way comparison." into main am: 718ef28b58
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2722756
Change-Id: Ib76bfa9f2cf38608280bf5db3d0371890aa91880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:26:49 +00:00
Zoe Tsou
718ef28b58
Merge "Implement N way comparison." into main
2023-08-25 08:44:47 +00:00
Zoe Tsou
48f8bf931f
Implement N way comparison.
...
The attributes tested_items and pass_rate are added for easier display in the
n_way_comparison function.
Bug: 296988808
Test: ./compare_cts_reports.py -r test_result_1.xml -r test_result_2.xml -m n \
-d output_dir
Change-Id: I1dc6bb9c33dfe5be879cbdc13f684bde123e5e71
2023-08-25 07:41:01 +00:00
Treehugger Robot
76ebade138
Merge "cargo2rulesmk.py: Support customizing rustc" into main am: a3f72f8382
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2726754
Change-Id: I97bc24abedd6fb9bb4cfc51fe09de053f7c19700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 06:06:08 +00:00
Treehugger Robot
8b015adc3f
Merge "cargo2rulesmk.py: Remove Python match usage" into main am: df1d22da9c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2726753
Change-Id: I013fa2df5248b31acc49a2916d7a8fa860189f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 06:05:42 +00:00
Treehugger Robot
a3f72f8382
Merge "cargo2rulesmk.py: Support customizing rustc" into main
2023-08-25 05:36:16 +00:00
Treehugger Robot
df1d22da9c
Merge "cargo2rulesmk.py: Remove Python match usage" into main
2023-08-25 05:36:08 +00:00
Andrei Homescu
e88e4d6a5f
cargo2rulesmk.py: Support customizing rustc
...
Port aosp/2633771 to cargo2rulesmk.py.
Bug: 281857510
Test: Run in sandbox on bitflags crate
Change-Id: I85b884351f621a6d96cd2b01ee5113687eb72f32
2023-08-24 22:13:45 +00:00
Andrei Homescu
fb0b60ff12
cargo2rulesmk.py: Remove Python match usage
...
The script uses Python match which was introduced
in Python 3.10. The sandbox only has 3.8, so we need
to remove match so the script can run.
Bug: 281857510
Test: Run in sandbox on bitflags crate
Change-Id: Id03b0e02f8593b551f2aca201fe0ed2659d58d21
2023-08-24 22:13:39 +00:00
Treehugger Robot
191826b8c5
Merge "Move logic for detecting different kinds of externs to cargo_out." into main am: 8df3496e01
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2711993
Change-Id: I89a0f559d8834cb1b9ad874584c6f135850e912f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-23 11:35:28 +00:00
Treehugger Robot
202bd7bd98
Merge changes I5a2e2871,I53b1f37e,I693ea16a into main am: e1c97bd7e9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2709518
Change-Id: I4b1b598913e0c018a6490a134d2e59e3620fbb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-23 11:35:11 +00:00
Treehugger Robot
8df3496e01
Merge "Move logic for detecting different kinds of externs to cargo_out." into main
2023-08-23 11:35:00 +00:00
Treehugger Robot
e1c97bd7e9
Merge changes I5a2e2871,I53b1f37e,I693ea16a into main
...
* changes:
Split cargo_out into three modules.
Factor out functions to find package directory.
Add more doc comments and break up parse_cargo_out function.
2023-08-23 11:07:41 +00:00
Treehugger Robot
f84943e6af
Merge "STT: combined build supports more targets to build" into main am: 795b8b2e6f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2722733
Change-Id: Ie5f738bd4345743c333550ed52e7de43e5e196c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-23 06:34:31 +00:00
Treehugger Robot
795b8b2e6f
Merge "STT: combined build supports more targets to build" into main
2023-08-23 06:11:12 +00:00
Justin Yun
f44122fa9b
STT: combined build supports more targets to build
...
The script allows adding more targets using -a option multiple time.
Only a single -a will test aba build as before, but adding multiple
-a options will build the targets in sequence.
Bug: 293821290
Test: combined_build_test.sh -t primary -v userdebug -d out_dist \
-a alter1 -a alter2 -a alter3 -c -o -r droid
Change-Id: I3bc4d2f0dad6bac7aa32b165ca667334f90eb83b
2023-08-23 10:57:49 +09:00
Zoe Tsou
e0776bf3e3
Merge "Compare two cts reports." into main am: c771718b72
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2714235
Change-Id: I7677bfc08c37b118db55b91c573294c5dec8f2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 10:08:19 +00:00
Zoe Tsou
c771718b72
Merge "Compare two cts reports." into main
2023-08-22 09:27:40 +00:00
Zoe Tsou
9ea1b08298
Compare two cts reports.
...
Assumptions:
1. The input report file can be a zip file result from a standard cts
test tool, or a test_result.xml
2. If there are multiple cts reports after the -r flag, it means to view
these files as one report. The script aggregates them according to the
same rules as b/293809772.
Bug: 296323842
Test: ./compare_cts_reports.py -r [a.zip, test_result_1.xml] -r [b.zip,
test_result_2.xml] -m [1, 2] [-d output_directory] [-o]
Change-Id: I885dd07cd40d38ba0c2ee1cb38570a926606a4d9
2023-08-22 05:08:45 +00:00
Vinh Tran
b28ab67151
Merge "Fix path to add3prf.py when calling from get_rust_pkg.py" into main am: 7c7c46b596
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2717393
Change-Id: I4182beb21e6f2e61a50d1272c31acfaf82c0e550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 02:10:36 +00:00
Vinh Tran
7c7c46b596
Merge "Fix path to add3prf.py when calling from get_rust_pkg.py" into main
2023-08-21 01:30:07 +00:00
Zhi Dou
b8024771a9
Merge "Add demo code for testing" into main am: 4db54e9935
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2712013
Change-Id: Id54918b6efe17c11663562ffd2dd515935e1392d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 21:15:34 +00:00
Zhi Dou
4db54e9935
Merge "Add demo code for testing" into main
2023-08-18 20:35:46 +00:00
Zhi Dou
3c4cc122eb
Add demo code for testing
...
This change add demo for using test mode flag lib in
self-instrumentation tests.
There are two options.
The option 1 is to create two versions, prod and test, of the library
using flags. The prod version library uses prod flag lib, and the test
version library uses test flag lib.
The option 2 is to dynamically link to the flag lib in the library. The
flag lib is used as a stub lib and is just used for building purpose.
The in the finally binary which uses the library, the binary should
statically link to the right version of the flag lib.
Bug: 295561701
Test: atest AconfigDemoUnitTests1 && atest AconfigDemoUnitTests2
Change-Id: Ie571a260d9042933032c702095808dbf59d1697c
2023-08-18 19:45:14 +00:00
Vinh Tran
46e085a961
Fix path to add3prf.py when calling from get_rust_pkg.py
...
When --add3prf is set, `get_rust_pkg.py` script `cd` into the crate directory and run `add3prf.py`. However, `add3prf.py` doesn't exist in the newly downloaded crate directory. This CL ensures that we reference to the existing `add3prf.py` script.
Test: development/scripts/get_rust_pkg.py -add3prf -v -o /tmp tinyjson-2.5.1
Change-Id: I4273d4f2b6a1f353960adbbab9abbb96bf3e68f3
2023-08-18 10:21:56 -04:00
Treehugger Robot
430cf9bb2b
Merge "cherry pick: Create rust codelab via a Rust lib used by a system app" into main am: 4bed088780
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2711374
Change-Id: Ib2e83a9a8f61f413a5d016477f32e6ae2f60afed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 19:58:29 +00:00
Treehugger Robot
4bed088780
Merge "cherry pick: Create rust codelab via a Rust lib used by a system app" into main
2023-08-16 18:52:11 +00:00
Treehugger Robot
48279db136
Merge "Update codelab system app to use native code" into main am: 481b4c64f4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2712093
Change-Id: I8acae6bd21cb0ee1d504eacaa672df4e20dbfa14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:29:17 +00:00
Treehugger Robot
3115ed1f44
Merge "Rename libsyn to libsyn2" into main am: 8449944a50
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2601328
Change-Id: Ie6e0ebec2a11488c4c678fe10a94d157d6a24006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:28:34 +00:00