Commit Graph

34210 Commits

Author SHA1 Message Date
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
Dennis Shen
f422a8b846 cherry pick: Create rust codelab via a Rust lib used by a system app
Bug: b/295875546
Change-Id: I3b0e6133c4c007843d24501476a9d391241019b0
Merged-In: I3b0e6133c4c007843d24501476a9d391241019b0
2023-08-16 18:00:32 +00:00
Treehugger Robot
481b4c64f4 Merge "Update codelab system app to use native code" into main 2023-08-16 17:54:51 +00:00
Dennis Shen
22860d2f33 Update codelab system app to use native code
Bug: b/291771121
Test: tested on local devices
Change-Id: I1532d89ef185c584d3cc76c0541a0f47e622e3fb
Merged-In: I1532d89ef185c584d3cc76c0541a0f47e622e3fb
2023-08-16 17:21:29 +00:00
Treehugger Robot
8449944a50 Merge "Rename libsyn to libsyn2" into main 2023-08-16 17:10:05 +00:00
Andrew Walbran
9454b29450 Move logic for detecting different kinds of externs to cargo_out.
This will work differently when not running cargo.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I6c7b1f6266d7d66bcbb68387d06f59306695008e
2023-08-16 16:27:25 +01:00
Andrew Walbran
085fa6c6b1 Split cargo_out into three modules.
The `cargo` module has the output types, `cargo_out` has the code
specific to parsing cargo.out files, while `metadata` has the types to
parse cargo.metadata files.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I5a2e2871a48bf30a64f3ffbc84a160b0daa91b53
2023-08-16 12:54:20 +01:00
Andrew Walbran
6cf047b9ed Factor out functions to find package directory.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I53b1f37ed1a9cd171c373c7fb4effda94f887437
2023-08-16 10:34:29 +01:00
Andrew Walbran
a1468cca18 Add more doc comments and break up parse_cargo_out function.
This is a step towards making it testable.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I693ea16adf82f73c73a93e8dfa5ed4f351760828
2023-08-16 10:34:29 +01:00
Treehugger Robot
fe3997ee8c Merge "Make tests configuration option optional." into main am: e64a580e9f
Original change: https://android-review.googlesource.com/c/platform/development/+/2710054

Change-Id: I93edc92b92faafad31727a43cd614295d2856902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 19:55:53 +00:00
Treehugger Robot
a14174c300 Merge "Add test for generating Android.bp from list of crates." into main am: 4266276d42
Original change: https://android-review.googlesource.com/c/platform/development/+/2695088

Change-Id: Idf315debd29afe266b4be40ca7a70a68f3995bca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 19:55:39 +00:00
Treehugger Robot
5a0b334577 Merge "Remove emit_list." into main am: 3c9af85e16
Original change: https://android-review.googlesource.com/c/platform/development/+/2710053

Change-Id: I1899f5b4c7d260169bc0b0cf6baf495385401083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 19:54:17 +00:00
Treehugger Robot
e64a580e9f Merge "Make tests configuration option optional." into main 2023-08-15 18:52:25 +00:00
Treehugger Robot
4266276d42 Merge "Add test for generating Android.bp from list of crates." into main 2023-08-15 18:51:45 +00:00
Treehugger Robot
3c9af85e16 Merge "Remove emit_list." into main 2023-08-15 18:36:13 +00:00
Andrew Walbran
8e86dfe14e Make tests configuration option optional.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: Ia35acdcad920e0f585cc5be650f1d1e3b6aa176d
2023-08-15 17:47:06 +01:00
Andrew Walbran
3da057735e Add test for generating Android.bp from list of crates.
Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I2be01cee617913d429ceb5f41f81126d38301ede
2023-08-15 17:47:06 +01:00
Andrew Walbran
2a4c28bf67 Remove emit_list.
It's not used anywhere.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I8ab1cbec7fe05997c9b24a8e0b658c092a6046ae
2023-08-15 16:54:00 +01:00
Zoe Tsou
fd091be5b2 Merge "The script parse_cts_report.py converts single cts report into \ three files: info.json result.csv summary.csv" into main am: 3492dd1d35
Original change: https://android-review.googlesource.com/c/platform/development/+/2704355

Change-Id: I4481aa6ad1453c1ea03d45457c37c00e9870af71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 10:24:52 +00:00
Zoe Tsou
3492dd1d35 Merge "The script parse_cts_report.py converts single cts report into \ three files: info.json result.csv summary.csv" into main 2023-08-15 09:41:30 +00:00
Zoe Tsou
c864e8880b The script parse_cts_report.py converts single cts report into \
three files:
    info.json
    result.csv
    summary.csv

The class Report() is implemented so that parse_cts_report.py \
can be easily used by another script aggregate_reports.py.

The script aggregate_reports.py converts multiple cts reports into \
three files:
    info.json
    result.csv
    summary.csv

Assumptions:
    1. If the input is a zip file, the struture should be
        abc.zip
        |----abc/
        |    |----test_result.xml
    2. The input file and the output directory must have existed.

Bug: 293809772
Test: `./parse_cts_report.py --report-file [a.zip, test_result.xml] \
    -d output_directory`
Test: `./aggregate_reports.py --report-files a.zip b.zip -d \
    output_directory`
Change-Id: I8e5481ecc1ebf7f370debb59cb3c065cf9edcfad
2023-08-15 08:42:03 +00:00
Dennis Shen
5b7794eec9 Merge "Add the first flag to core_experiments_team_internal" into main am: 6c53c6aab9
Original change: https://android-review.googlesource.com/c/platform/development/+/2705513

Change-Id: I982e4115de814660894b6dd272b2345cc6094d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 20:53:33 +00:00
Dennis Shen
6c53c6aab9 Merge "Add the first flag to core_experiments_team_internal" into main 2023-08-11 20:08:22 +00:00
Dennis Shen
a117eb53ed Add the first flag to core_experiments_team_internal
Add an internal dir to host an aconfig file that is dedicated to
trunk_stable_workflow testing. We should use this one, instead the one
dedicated to the demo app.

Bug: 294537090
Change-Id: I1a28da8e202f5f454df35f298c8c962d3b9b229b
2023-08-11 14:15:34 +00:00
Zhi Dou
f00e03460b Merge "Rename MockFlagsRule" into main am: 50f1ed2988
Original change: https://android-review.googlesource.com/c/platform/development/+/2694627

Change-Id: I1699b80fd250fdc66558cb687c3c567caa12acfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 20:28:38 +00:00