Yi Kong
95f3118da3
Merge "Revert "Migrate to the new clang lib dir"" am: 05c9290c30 am: a7b120e3b2
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2439794
Change-Id: Ia8be35c8ff5fea6e867fd1346d45174f17cc3ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 08:53:46 +00:00
Yi Kong
a7b120e3b2
Merge "Revert "Migrate to the new clang lib dir"" am: 05c9290c30
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2439794
Change-Id: I304799c8592695fc47555a28ac54a951e3cac10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 08:12:58 +00:00
Yi Kong
05c9290c30
Merge "Revert "Migrate to the new clang lib dir""
2023-02-16 07:44:45 +00:00
Yi Kong
f1995f429c
Revert "Migrate to the new clang lib dir"
...
This reverts commit b9e03c4fae .
This is properly fixed by https://r.android.com/2439693 .
Change-Id: I3950cb4f6c45bad56b1cd4b143e28067a462f783
2023-02-16 07:41:51 +00:00
Hsin-Yi Chen
7de89e5987
Merge "Simplify the return value of CompareCommonRecordFields" am: 16e50ed2a6 am: c7ee365574
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2420999
Change-Id: I3e3695566a2b79cb5ca3fd5ffebdfcb3b79eb1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 03:56:54 +00:00
Hsin-Yi Chen
c7ee365574
Merge "Simplify the return value of CompareCommonRecordFields" am: 16e50ed2a6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2420999
Change-Id: I418617fdebaafbb626d50c08435b0ad99bee90e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 03:14:53 +00:00
Hsin-Yi Chen
16e50ed2a6
Merge "Simplify the return value of CompareCommonRecordFields"
2023-02-16 02:32:37 +00:00
Jeongik Cha
feab1067f3
Merge "The script to find a proper build id for system image" am: a6e19ea288 am: 05ff0279d4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2435372
Change-Id: Iab2f66051be2242640bd3fa82b37ae1e3c0d184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 16:57:20 +00:00
Jeongik Cha
05ff0279d4
Merge "The script to find a proper build id for system image" am: a6e19ea288
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2435372
Change-Id: I64becb8d36485c6c5f85334b22f22b8a8ac2c191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 16:08:48 +00:00
Jeongik Cha
a6e19ea288
Merge "The script to find a proper build id for system image"
2023-02-15 15:05:58 +00:00
Jeongik Cha
2e7dd2cb9c
The script to find a proper build id for system image
...
Bug: 269229550
Test: ./develpment/multitree/find_build_id.py
Change-Id: Ic0a4f404b56fb491d8053feab285c021a8ce2213
2023-02-15 13:56:19 +00:00
Yi Kong
eb294b46bd
Merge "Migrate to the new clang lib dir" am: f30be10e46 am: 94e6f6d836
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2437176
Change-Id: I8dda957e3ad2d86472ca68a8ca7ffdd19e63ef12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 12:02:35 +00:00
Yi Kong
94e6f6d836
Merge "Migrate to the new clang lib dir" am: f30be10e46
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2437176
Change-Id: I827ebc79cbe1bcf93d855608528638c6127a2fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 11:13:38 +00:00
Yi Kong
f30be10e46
Merge "Migrate to the new clang lib dir"
2023-02-15 10:05:52 +00:00
Hsin-Yi Chen
36b3b953cb
Merge "Diff the fields located at the same offset in a class" am: 28f992d407 am: 24970db9b8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2390652
Change-Id: I18eaea405fd47f90d5cac6e4e6e8ba91d7d97a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 10:05:19 +00:00
Yi Kong
c57fcd8b05
Merge "Migrate to the new clang lib dir" am: b1785dc0a8 am: 792e644ad0
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2437177
Change-Id: If3417eacefddcef11e4af07c263b8a589f06fc03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 10:04:56 +00:00
Hsin-Yi Chen
24970db9b8
Merge "Diff the fields located at the same offset in a class" am: 28f992d407
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2390652
Change-Id: If832904123f290dd8ccef1b91bd075fac2cc817c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 09:16:33 +00:00
Yi Kong
792e644ad0
Merge "Migrate to the new clang lib dir" am: b1785dc0a8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2437177
Change-Id: Ia0b859b449a8ec4cd684fe684536e0c424d809ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 09:16:21 +00:00
Hsin-Yi Chen
3417140281
Simplify the return value of CompareCommonRecordFields
...
Before this commit, the function returns
(kDirectDiff, RecordFieldDiffIR *) or (kIndirectDiff/kNoDiff, nullptr).
The commit changes the return value to a DiffStatus. The caller decides
whether to create a RecordFieldDiffIR by the DiffStatus.
Test: ./test.py
Bug: 255702405
Change-Id: If2bfd5bca78e9d924be34ad5c522db9b91382cde
2023-02-15 16:44:18 +08:00
Hsin-Yi Chen
28f992d407
Merge "Diff the fields located at the same offset in a class"
2023-02-15 08:42:25 +00:00
Yi Kong
b1785dc0a8
Merge "Migrate to the new clang lib dir"
2023-02-15 08:03:29 +00:00
Yi Kong
b9e03c4fae
Migrate to the new clang lib dir
...
Test: presubmit
Bug: 218706358
Change-Id: I010d1a6d51c42148a5f485fea1f8cb8cfad2e834
2023-02-15 16:59:01 +09:00
Yi Kong
7daeb1f361
Migrate to the new clang lib dir
...
Test: presubmit
Bug: 218706358
Change-Id: I6825f7c1f4340a30a14d9d8ce0fb5a3caf813f9e
2023-02-15 16:50:07 +09:00
Hsin-Yi Chen
08e0ce1066
Diff the fields located at the same offset in a class
...
- Rewrite the diff algorithm to handle multiple fields located at the
same offset in a class, struct or union.
- Allow renaming a field if its (offset, type) pair is unique.
Bug: 255702405
Test: ./test.py
Change-Id: I79ebe9a827822b0f89d95952fa7d8c30499ca680
2023-02-13 10:23:02 +08:00
Treehugger Robot
05b9ae4eef
Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962 am: 2a9c4a2b22
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2421465
Change-Id: I493c28066877c2151482f5fe99959b29b3c90090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 23:03:23 +00:00
Treehugger Robot
2a9c4a2b22
Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2421465
Change-Id: I8f39dc8dc3f035f050adc7de2adfdbed329d4da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 22:40:38 +00:00
Treehugger Robot
66f9ab6962
Merge "Extend cargo2android.py version matching to include alpha and beta crates"
2023-02-03 22:01:40 +00:00
Colin Cross
602c2483a5
Extend cargo2android.py version matching to include alpha and beta crates
...
The ring crate hasn't had a non-alpha release in over two years, and
may need to be updated to an alpha release. Modify the version regex
in cargo2android.py to recognize the alpha version as part of the
version suffix.
Test: manually run cargo2android.py in redshell
Change-Id: If48d5be339d10bc3e6651485b0038b7219403077
2023-02-03 12:39:51 -08:00
Treehugger Robot
2c8aeb3fd2
Merge "Rolling to 34.0.0. for UDC." am: c60a5da303 am: e04ea4a2f4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2419798
Change-Id: Ie141df430fbf0ed2d371bb95ba373b5b0b7e6ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 18:39:26 +00:00
Treehugger Robot
e04ea4a2f4
Merge "Rolling to 34.0.0. for UDC." am: c60a5da303
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2419798
Change-Id: Icb7b84371bea8f8a0f20dc17a340340f36a6c68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 18:16:50 +00:00
Treehugger Robot
c60a5da303
Merge "Rolling to 34.0.0. for UDC."
2023-02-03 18:01:03 +00:00
Shaju Mathew
43940506b3
Rolling to 34.0.0. for UDC.
...
Bug: 267330961
Test: Treehugger
Change-Id: Ieeb199230e9f037cfeb7dfa16ecc8eead17ac574
Signed-off-by: Shaju Mathew <shaju@google.com >
2023-02-02 17:03:59 -08:00
Hsin-Yi Chen
ab164d548b
Merge "Diff array types" am: 9b286a1967 am: e380c2f9cc
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2385933
Change-Id: I84fb222026613f6fd6f783a005b7ad4886bb64cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 21:40:54 +00:00
Hsin-Yi Chen
ceb1b92809
Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997 am: fe3d1b16b4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2411373
Change-Id: I357e4cc61c395c5848cb8689d40cb594e4c8eade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 21:32:11 +00:00
Hsin-Yi Chen
e380c2f9cc
Merge "Diff array types" am: 9b286a1967
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2385933
Change-Id: I1227595d9835dcc1ce5420bc19a5d7e674a18926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 21:31:11 +00:00
Hsin-Yi Chen
fe3d1b16b4
Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2411373
Change-Id: Iceeeaa05c59645fb81083b576da47382c846fa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 20:55:12 +00:00
Hsin-Yi Chen
9b286a1967
Merge "Diff array types"
2023-02-02 08:27:42 +00:00
Hsin-Yi Chen
6ecc9e3997
Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult"
2023-02-02 06:31:49 +00:00
Hsin-Yi Chen
64930c428f
Diff array types
...
This commit implements the function that compares array size, alignment,
and element type.
Test: ./test.py ; update prebuilts/clang-tools and build
Bug: 255702405
Change-Id: I4f25d22f060cfda04bbd88b9c2521461b95e6829
2023-02-02 12:58:35 +08:00
Jeffrey Vander Stoep
6c483c6846
Merge "c2a: make Rust version matchin regex less exact" am: 7b902e93f4 am: d735d27953
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2411666
Change-Id: Ice494ed5832677ed66480f4a09a7a85f31174e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 21:24:22 +00:00
Jeffrey Vander Stoep
d735d27953
Merge "c2a: make Rust version matchin regex less exact" am: 7b902e93f4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2411666
Change-Id: I927ad6fa96e813c7c2da7023561b09e52bb2ee3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 20:46:38 +00:00
Jeffrey Vander Stoep
7b902e93f4
Merge "c2a: make Rust version matchin regex less exact"
2023-02-01 18:12:39 +00:00
Jeff Vander Stoep
b06dd5c7e2
c2a: make Rust version matchin regex less exact
...
Allow custom version like 1.65.0.p1 (added in aosp/2404317).
Resolves warning:
WARNING: cannot find RustDefaultVersion in
development/scripts/../../build/soong/rust/config/global.go
Change-Id: I6fced7695473e025b0f739f9986df932d2c3f5fe
Test: cargo2android.py --config cargo2android.py
no warning
Change-Id: I43ff81f061477fc0322f27fef1c950954130dbc6
2023-02-01 14:23:40 +01:00
Jeffrey Vander Stoep
dff4d31a72
Merge "Include non-local tests by path" am: 6e50b8e094 am: 16f9b85bed
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2402710
Change-Id: I92eab5e51191b68b928cd1c3a09ed16ced136e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 09:11:38 +00:00
Hsin-Yi Chen
eb5797a263
Rename GenericFieldDiffInfo to RecordFieldDiffResult
...
Test: ./test.py
Bug: 255702405
Change-Id: I7e1112697f75b0a93ab821a128054e7e80acd6e1
2023-02-01 16:22:31 +08:00
Jeffrey Vander Stoep
16f9b85bed
Merge "Include non-local tests by path" am: 6e50b8e094
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2402710
Change-Id: Iafd69de2a3e3845ef143ffc23eecaa8396fd788f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 08:17:12 +00:00
Jeffrey Vander Stoep
6e50b8e094
Merge "Include non-local tests by path"
2023-02-01 07:42:21 +00:00
Treehugger Robot
520ccc6b0d
Merge "Platform tools 33.0.4: rev bump" am: c3e0908508 am: 17008c1ce2
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2410815
Change-Id: I23cf1cbb61a6e379ae256122c70aac54948bec43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-31 22:29:27 +00:00
Treehugger Robot
17008c1ce2
Merge "Platform tools 33.0.4: rev bump" am: c3e0908508
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2410815
Change-Id: Icedc41860afa6f4496d543963eb50bf4abe0df6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-31 21:21:37 +00:00
Treehugger Robot
c3e0908508
Merge "Platform tools 33.0.4: rev bump"
2023-01-31 20:51:47 +00:00