Commit Graph

33823 Commits

Author SHA1 Message Date
Yi Kong
0d0f902b3d Merge "Update clang version to clang-r487747" am: 1fb80a1dc3
Original change: https://android-review.googlesource.com/c/platform/development/+/2462733

Change-Id: Id2c2e0723fa5ae8d93ea7d0e63932b757ce9009f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 10:50:56 +00:00
Yi Kong
1fb80a1dc3 Merge "Update clang version to clang-r487747" 2023-03-01 09:54:01 +00:00
Yi Kong
c08ebcfe53 Update clang version to clang-r487747
Change-Id: I254e4e31244599c7931a169a571f56b44d34b801
Test: presubmit
Bug: 264965700
2023-03-01 16:45:59 +09:00
Logan (Tzu-hsiang) Chien
4a1241d632 Merge "[repo-pull] Support curl hook" am: 3fe6f2d960
Original change: https://android-review.googlesource.com/c/platform/development/+/2433667

Change-Id: If14e4bfe5fa0afe6053aa84e4c097a2d0a526c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 23:06:10 +00:00
Logan (Tzu-hsiang) Chien
3fe6f2d960 Merge "[repo-pull] Support curl hook" 2023-02-24 18:26:18 +00:00
Logan Chien
5cf3c7b443 [repo-pull] Support curl hook
This commit adds a CURL command hook. This enables the Gerrit REST API
access through other authentication mechanisms.

Bug: b/269362063
Test: Run gerrit.py, repo_patch.py, repo_review.py with --use-curl=curl
Change-Id: I6dc4eb78760ee598df5065665c15d689916706f0
2023-02-23 08:32:41 -08:00
Hsin-Yi Chen
97e4fe9e35 Merge "Convert type_queue to a member of AbiDiffHelper" am: feab6687e7
Original change: https://android-review.googlesource.com/c/platform/development/+/2437275

Change-Id: I61579f4691309c482b3b98ce93a075ffd644c886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 05:48:00 +00:00
Hsin-Yi Chen
feab6687e7 Merge "Convert type_queue to a member of AbiDiffHelper" 2023-02-23 05:04:56 +00:00
Hsin-Yi Chen
3b7728c88b Convert type_queue to a member of AbiDiffHelper
Test: ./test.py
Bug: 255702405
Change-Id: Ic1561812fe2b456b8c21440ef8a2439b0545f874
2023-02-22 13:44:09 +08:00
Hsin-Yi Chen
45117247f9 Merge "Link clang tools' lib directory before copying clang libraries" am: cf9a57f8c6
Original change: https://android-review.googlesource.com/c/platform/development/+/2446163

Change-Id: Ia59e028909af01475fa0aa08a73afb0e9fa633e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 10:59:06 +00:00
Hsin-Yi Chen
cf9a57f8c6 Merge "Link clang tools' lib directory before copying clang libraries" 2023-02-21 09:46:33 +00:00
Hsin-Yi Chen
9a0530cb9b Link clang tools' lib directory before copying clang libraries
This commit restores lib/libc++.so.1 and lib/libclang-cpp.so.16 which
are indirect dependencies of clang tools.

Bug: 218706358
Test: out/soong/dist/bin/versioner -h
Change-Id: I3b9414645dc5b56d322d21e082feca260519d053
2023-02-21 08:26:14 +00:00
Hsin-Yi Chen
235a704572 Merge "Replace TypeQueueCheckAndPushBack with TypeStackGuard" am: 78562c0157
Original change: https://android-review.googlesource.com/c/platform/development/+/2437274

Change-Id: Ic711553b46097ae4cd13920517e75b32ae673084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 04:35:13 +00:00
Hsin-Yi Chen
78562c0157 Merge "Replace TypeQueueCheckAndPushBack with TypeStackGuard" 2023-02-21 03:10:18 +00:00
Hsin-Yi Chen
a473afa860 Merge "Return DiffStatus from FilterOutRenamedRecordFields" am: 4602059a36
Original change: https://android-review.googlesource.com/c/platform/development/+/2421979

Change-Id: I735039e61ca4e765f7d5198c095615ae39b80db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 09:18:40 +00:00
Hsin-Yi Chen
4602059a36 Merge "Return DiffStatus from FilterOutRenamedRecordFields" 2023-02-20 08:24:42 +00:00
Weston Carvalho
f03c096970 Merge "gerrit.py: Support .googlesource.com credentials" am: dea943b670
Original change: https://android-review.googlesource.com/c/platform/development/+/2431492

Change-Id: I8f36619d982619c717483463c5671c901d419494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 20:12:00 +00:00
Weston Carvalho
dea943b670 Merge "gerrit.py: Support .googlesource.com credentials" 2023-02-17 19:31:10 +00:00
Weston Carvalho
bcf3bdf841 gerrit.py: Support .googlesource.com credentials
The scripts currently check that the requested domain exactly matches
one of the domains in the user's `.gitcookies` file, which causes
a "Cannot find the domain" error if the user's credentials are for all
of `googlesource.com`.

Change-Id: Ifed117e7d76c8678558720db1d518d59d986521d
2023-02-17 18:20:28 +00:00
Frederick Mayle
5f1b7a1e59 Merge "cargo_embargo: add option to set module visibility" am: 97f5616689
Original change: https://android-review.googlesource.com/c/platform/development/+/2438516

Change-Id: Ie066e264a0c3441824955c1ea1e535579641801c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 20:08:37 +00:00
Frederick Mayle
97f5616689 Merge "cargo_embargo: add option to set module visibility" 2023-02-16 19:26:27 +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
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
Frederick Mayle
5b2ed7a0f5 cargo_embargo: add option to set module visibility
Bug: 269356487
Test: ran on crosvm repo
Change-Id: Ibcbdd26115c0e54d3b2825e26083ed74000b7563
2023-02-15 10:55:17 -08: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
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
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
033af47aa6 Replace TypeQueueCheckAndPushBack with TypeStackGuard
A followup commit will rename type_queue to type_stack.

Test: ./test.py
Bug: 255702405
Change-Id: Ie5c21b0883f08386d30b80ca955708aa7f4bdb16
2023-02-15 16:48:19 +08:00
Hsin-Yi Chen
17d6299cae Return DiffStatus from FilterOutRenamedRecordFields
The status of the filtered out fields is either kNoDiff or
kIndirectDiff. It does not affect the diff report, but makes
ModuleMerger determine redefined types more accurately.

Test: ./test.py ; update the prebuilt clang tools and build
Bug: 255702405
Change-Id: Ia94225d25e00597affa8b1e01a7c9de592bf5b05
2023-02-15 16:44:32 +08: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
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
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
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