Commit Graph

35503 Commits

Author SHA1 Message Date
Zoe Tsou
b4dbd9c24e Merge "Add constant.py." into main am: 8ca4239aed
Original change: https://android-review.googlesource.com/c/platform/development/+/2755986

Change-Id: I1779c0cac1df730692fcafb26e9b6d5245ee873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 12:23:41 +00:00
Zoe Tsou
8ca4239aed Merge "Add constant.py." into main 2023-09-19 11:44:51 +00:00
Zoe Tsou
a80614615e Merge "Add unit tests for tools/compare_cts_reports." into main am: 2b53c7eb2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2749842

Change-Id: Iec372a821b9f849120d912d409a7e594f64b1c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:58:35 +00:00
Zoe Tsou
2b53c7eb2e Merge "Add unit tests for tools/compare_cts_reports." into main 2023-09-19 07:26:21 +00:00
Zoe Tsou
52b17faace Add constant.py.
Bug: 292453652
Test: ./parse_cts_report.py -r REPORT -d OUTPUT_DIR &&
  ./aggregate_cts_reports.py -r REPORT [REPORT ...] -d OUTPUT_DIR &&
  ./compare_cts_reports.py [-r CTS_REPORTS [CTS_REPORTS ...]] \
  [--folder CTS_REPORTS] --mode {1,2,n} --output-dir OUTPUT_DIR [--csv CSV] [--output-files]
Change-Id: I96a135feb84b8f5e4dad939500865a65c000351d
2023-09-19 07:24:36 +00:00
Treehugger Robot
0a87d2304e Merge "Fix the order of suffix in Android.bp" into main am: 09de1731fd
Original change: https://android-review.googlesource.com/c/platform/development/+/2753590

Change-Id: I9fe5d3a27228d72c8e43a10d3de55f0d9650d1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:21:16 +00:00
Treehugger Robot
09de1731fd Merge "Fix the order of suffix in Android.bp" into main 2023-09-18 21:44:36 +00:00
Zhi Dou
4249de3bbc Merge "Fix b/300640506" into main am: aa683c3fa8
Original change: https://android-review.googlesource.com/c/platform/development/+/2754745

Change-Id: Ib9d9f9868a2ce033dfd6d0ce1039f4b77b681ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 17:07:40 +00:00
Zhi Dou
aa683c3fa8 Merge "Fix b/300640506" into main 2023-09-18 16:02:33 +00:00
Zhi Dou
01f00d9d78 Fix b/300640506
Test: atest AconfigDemoUnitTests
Bug: b/300640506
Change-Id: Ie3893290a53c22b8aed2af2e07d8034f8240cdcf
2023-09-18 14:49:02 +00:00
Jeongik Cha
3151ae84ef Fix the order of suffix in Android.bp
rust_library + host_suffix + rlib_suffix is the right order
For example, rust_library_host_dylib, rust_library_host_rlib

Bug: 277909042
Test: cargo2android --run --force-rlib
Change-Id: Ib156b96853eb51bae1f68229ebe76b87b0f8b363
2023-09-18 20:00:58 +09:00
Zhi Dou
e8d37e5461 Merge "add a read only flag for demo" into main am: dddb3fa987
Original change: https://android-review.googlesource.com/c/platform/development/+/2752905

Change-Id: Id1b2f27a247752baac9408ab06fe66ec41651dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 15:33:03 +00:00
Zhi Dou
dddb3fa987 Merge "add a read only flag for demo" into main 2023-09-15 15:07:28 +00:00
Zhi Dou
ce3f8d4352 add a read only flag for demo
Bug: 298754733
Test: atest AconfigDemoUnitTests
Change-Id: Ib01918b2469ea59091b47d49672800b5716beb88
2023-09-15 14:17:25 +00:00
Hsin-Yi Chen
4397c78a91 Merge "Exclude version blocks by patterns" into main am: 2f5228f1dc
Original change: https://android-review.googlesource.com/c/platform/development/+/2745605

Change-Id: Ie744d567fdc221c83909d14bf19cc69e98f6b6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 09:16:10 +00:00
Hsin-Yi Chen
2f5228f1dc Merge "Exclude version blocks by patterns" into main 2023-09-15 08:06:18 +00:00
Zoe Tsou
83445923e5 Add unit tests for tools/compare_cts_reports.
Bug: 293809772
Test: ./test_parse_cts_report.py
Test: ./test_aggregate_cts_reports.py
Change-Id: I813482cfdfdcc9a5f2384f95fd289fb7ff89619f
2023-09-15 07:42:10 +00:00
Hsin-Yi Chen
5e00b7aba7 Exclude version blocks by patterns
The version blocks ending with _PLATFORM and _PRIVATE are unstable ABIs.
To exclude them, header-abi-linker --exclude-symbol-version should
accept patterns like *_PLATFORM and *_PRIVATE.

Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin` \
      development/vndk/tools/header-checker/tests/test.py
Test: LD_LIBRARY_PATH=out/soong/dist/lib64 \
      out/soong/host/linux-x86/nativetest64/header-checker-unittests/header-checker-unittests
Bug: 298626434
Change-Id: Id82bc013b8de62b5ba8e5bd29f399b1b72ab5d39
2023-09-15 05:13:51 +00:00
James Farrell
109a220075 Merge "Support adding suffixes to module names and deps." into main am: 6c90665cee
Original change: https://android-review.googlesource.com/c/platform/development/+/2751102

Change-Id: I1b18dbd5374d02f517e33b3364403ee0b6639517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 20:28:55 +00:00
James Farrell
6c90665cee Merge "Support adding suffixes to module names and deps." into main 2023-09-13 19:32:43 +00:00
James Farrell
56475b17c5 Support adding suffixes to module names and deps.
This is helpful for crates like protobuf and syn for which we have
multiple versions, and will let us eliminate several patch files

Test: Ran it on everything in external/rust/crates.
Change-Id: I29ac1ee69be99b7164e1458e0d8fc1cb028b15a0
2023-09-13 18:00:42 +00:00
Treehugger Robot
369ba1062a Merge "Add some type annotations, mainly to help the IDE." into main am: 178665e03b
Original change: https://android-review.googlesource.com/c/platform/development/+/2749473

Change-Id: I9c9672d585f4555ecdca43b95fb75ce6fb978f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 22:52:39 +00:00
Treehugger Robot
178665e03b Merge "Add some type annotations, mainly to help the IDE." into main 2023-09-12 22:29:25 +00:00
James Farrell
a5c22d559c Add some type annotations, mainly to help the IDE.
No functional changes.

Test: Ran it.
Change-Id: Ifedf1c42628dae03968eeefd5101ae75456acd32
2023-09-12 21:14:33 +00:00
Hsin-Yi Chen
d9e245f33d Merge "Let build-prebuilts.sh compile unit tests" into main am: c0d2b6e79b
Original change: https://android-review.googlesource.com/c/platform/development/+/2738618

Change-Id: I39a38699f6a777fa6bf7cf292a7bb28d4a9e0fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 07:59:27 +00:00
Hsin-Yi Chen
c0d2b6e79b Merge "Let build-prebuilts.sh compile unit tests" into main 2023-09-12 07:00:36 +00:00
Elliott Hughes
c46e991fba Merge "Fix covreport folder permission" into main am: e1b30f6745
Original change: https://android-review.googlesource.com/c/platform/development/+/2742434

Change-Id: I708b29f0b2f213ef126c83be41d7e7c726301f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:07:01 +00:00
Elliott Hughes
e1b30f6745 Merge "Fix covreport folder permission" into main 2023-09-11 17:38:45 +00:00
Hsin-Yi Chen
9beee3bf06 Let build-prebuilts.sh compile unit tests
build-prebuilts.sh compiles header-checker-unittests by default. The
continuous builds ensure that the tests are compilable. The developers
can use the script to build the tests locally.

Test: OUT_DIR=out BUILD_BROKEN_DISABLE_BAZEL=1 \
      development/vndk/tools/header-checker/android/build-prebuilts.sh \
      header-checker-unittests
Test: OUT_DIR=out BUILD_BROKEN_DISABLE_BAZEL=1 DIST_DIR=/tmp/distdir \
      development/vndk/tools/header-checker/android/build-prebuilts.sh
Bug: 280008249
Change-Id: I32d6ade3c527785d68802c1737c94f963ead5b3c
2023-09-11 18:36:54 +08:00
Joey Jiao
ddd7c0ff87 Fix covreport folder permission
Change-Id: I671c0ddc1cd0632c3d81c9ec68825decc92b065a
2023-09-08 08:56:27 +08:00
Martin Geisler
93b6a1bb95 Merge "Revert "Rename libsyn to libsyn2"" into main am: 6f634869e6
Original change: https://android-review.googlesource.com/c/platform/development/+/2736875

Change-Id: I921a7565aa786185486f8b32598e817eb36433b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 14:50:13 +00:00
Martin Geisler
6f634869e6 Merge "Revert "Rename libsyn to libsyn2"" into main 2023-09-07 14:01:47 +00:00
Treehugger Robot
c0ce7f7c2f Merge "Update to clang-r498229b" into main am: c55eea75d2
Original change: https://android-review.googlesource.com/c/platform/development/+/2745473

Change-Id: I7c02005a677ae685682c118434a8c1e8c819cadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 12:24:55 +00:00
Treehugger Robot
c55eea75d2 Merge "Update to clang-r498229b" into main 2023-09-07 11:55:35 +00:00
Yi Kong
f8d367d015 Update to clang-r498229b
Bug: 293616148
Change-Id: Ic77a78f463691aa2c927cfa6bea009ef38e9f0d7
Test: presubmit
2023-09-07 10:48:55 +00:00
Zoe Tsou
26b723d39c Merge "Implement folder input." into main am: ad5a7859c8
Original change: https://android-review.googlesource.com/c/platform/development/+/2738614

Change-Id: I8a64bfb9b143e315a3ca6773f4c04ac81550b7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:03:51 +00:00
Zoe Tsou
ad5a7859c8 Merge "Implement folder input." into main 2023-09-07 09:24:59 +00:00
Zoe Tsou
e07b08ce7f Implement folder input.
One flag '-f' corresponds to one directory that stores a parsed report.

Bug: 296988808
Test: ./compare_cts_reports.py -r test_result_1.xml [test_result_2.xml] \
    [-r report.zip] [-f parsed_dir_1/] [-f parsed_dir_2/] -m n -d output_dir/
Change-Id: I26310982dc8ef18f5dbfb1a8382ea3a600508fbe
2023-09-07 03:25:58 +00:00
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
Martin Geisler
a6fe26c146 Revert "Rename libsyn to libsyn2"
This reverts commit 7705ea6d36.

Reason for revert: I believe this is stale since `libsyn` is version 2 now:

https://cs.android.com/android/platform/superproject/+/main:external/rust/crates/syn/Android.bp;l=41;drc=fcd71dcc29ef325341ea7c1a145591b349018eb3

Change-Id: I31892447cf95d094e4bb201c4d86a28c70085467
2023-09-01 14:08:46 +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