Commit Graph

34008 Commits

Author SHA1 Message Date
Treehugger Robot
fa52117f71 Merge "cargo_embargo: dedup output modules" am: 32be457c7a am: c1058e7efc
Original change: https://android-review.googlesource.com/c/platform/development/+/2583718

Change-Id: I41c27c3826719f713c9062b33618ffda295aa76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:02:27 +00:00
Treehugger Robot
c1058e7efc Merge "cargo_embargo: dedup output modules" am: 32be457c7a
Original change: https://android-review.googlesource.com/c/platform/development/+/2583718

Change-Id: Ic3fe6b120fa34e1be3b41ca09fa5200591b84b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 00:19:15 +00:00
Treehugger Robot
32be457c7a Merge "cargo_embargo: dedup output modules" 2023-05-15 23:49:52 +00:00
Treehugger Robot
ee6a9070ac Merge "Update clang version to clang-r487747c" am: 15b2fcc4db am: a5f1736529
Original change: https://android-review.googlesource.com/c/platform/development/+/2588270

Change-Id: Ic63d2a0d1f80d92981992eb097d398994c47b344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 19:11:39 +00:00
Treehugger Robot
a5f1736529 Merge "Update clang version to clang-r487747c" am: 15b2fcc4db
Original change: https://android-review.googlesource.com/c/platform/development/+/2588270

Change-Id: I562642b460c579eb3b3147246912da5c5fe10f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 18:32:26 +00:00
Treehugger Robot
15b2fcc4db Merge "Update clang version to clang-r487747c" 2023-05-13 17:59:25 +00:00
Yi Kong
fda7cced69 Update clang version to clang-r487747c
Test: presubmit
Bug: 279955553
Change-Id: I8043ab75173420f60e828d973ba69d47011c2953
2023-05-13 18:11:44 +01:00
Treehugger Robot
8cebf91fe5 Merge "Add --dependency-suffix flag." am: ff98cee914 am: 07d14fbba8
Original change: https://android-review.googlesource.com/c/platform/development/+/2586928

Change-Id: Ia6e3ca9a66de9516de8364d0e0908a4343e7e6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 19:22:12 +00:00
Treehugger Robot
07d14fbba8 Merge "Add --dependency-suffix flag." am: ff98cee914
Original change: https://android-review.googlesource.com/c/platform/development/+/2586928

Change-Id: I9fbf9027c296fe72a234c9fd33ba53f62aae13ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 18:41:24 +00:00
Treehugger Robot
ff98cee914 Merge "Add --dependency-suffix flag." 2023-05-12 18:10:40 +00:00
Andrew Walbran
59f441224e Add --dependency-suffix flag.
This adds a suffix to all dependencies, which may be useful for no_std
crates.

Bug: 279614907
Test: Ran on external/rust/crates/ciborium
Change-Id: I4d504fbfdcd079a946814dcf953b42baa0ca3563
2023-05-12 16:47:19 +00:00
Andrew Walbran
3b7ca38659 Merge "Fix handling of tests for variants." am: 8ddcc6c479 am: bea43b9f8a
Original change: https://android-review.googlesource.com/c/platform/development/+/2584688

Change-Id: I03276230e9aca6e8f4b42a275c1305d64e0f7e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:48:06 +00:00
Treehugger Robot
5c3ede3657 Merge "Added --no-std and --alloc flags." am: 1604ded8da am: 1688292a94
Original change: https://android-review.googlesource.com/c/platform/development/+/2584508

Change-Id: I77d439e4d77d3d96e174cc2f6783fb9e009db80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:47:56 +00:00
Andrew Walbran
bea43b9f8a Merge "Fix handling of tests for variants." am: 8ddcc6c479
Original change: https://android-review.googlesource.com/c/platform/development/+/2584688

Change-Id: Ie5f044b4b945e3d0a7fcb86be42665cfa6c4ae2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:09:01 +00:00
Treehugger Robot
1688292a94 Merge "Added --no-std and --alloc flags." am: 1604ded8da
Original change: https://android-review.googlesource.com/c/platform/development/+/2584508

Change-Id: I9cebb2d22028ddf9f989fcb1e2d8041ed60cf97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:08:44 +00:00
Andrew Walbran
8ddcc6c479 Merge "Fix handling of tests for variants." 2023-05-12 14:42:50 +00:00
Treehugger Robot
1604ded8da Merge "Added --no-std and --alloc flags." 2023-05-12 14:35:19 +00:00
Andrew Walbran
aff9481608 Fix handling of tests for variants.
Variant test and cargo flags were being ignored.

Bug: 279614907
Test: Ran on external/rust/crates/serde
Change-Id: I9c6cf71c8d04944cc7c532cfb53b50c2efc3e375
2023-05-12 13:24:37 +00:00
Andrew Walbran
d579a0fa61 Added --no-std and --alloc flags.
These allow most no_std crates to be supported without extra patches.

Bug: 279614907
Test: Ran on external/rust/crates/half
Change-Id: I1a69ff7950fb63320ef7c87d6cd45b20915df801
2023-05-12 13:22:55 +00:00
Frederick Mayle
3d6e609f03 cargo_embargo: dedup output modules
This is needed because of https://crrev.com/c/4517945. The new resolver
causes there to be multiple `rustc` invocations for some libraries. They
are only trivially different though, so dedup'ing the final output is
sufficient for now.

Bug: 280489895
Test: m cargo_embargo && ./android-merge-2-cargo-embargo.sh
Change-Id: If4a36e4f3847d18d03f76bad63bab6c45a9aef97
2023-05-10 14:57:13 -07:00
Anvesh Renikindi
471dd53d05 Merge "Added shortcutlauncherdemo Initialization provider" am: 270b7c9fed am: 0e8e66d199
Original change: https://android-review.googlesource.com/c/platform/development/+/2585516

Change-Id: Iaee257fa2029d2f03daae621d97e241139954eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:44:52 +00:00
Anvesh Renikindi
0e8e66d199 Merge "Added shortcutlauncherdemo Initialization provider" am: 270b7c9fed
Original change: https://android-review.googlesource.com/c/platform/development/+/2585516

Change-Id: Idd6a6303d4d8d7cc64a4b62f7027c5e7a7ce488b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:58 +00:00
Anvesh Renikindi
270b7c9fed Merge "Added shortcutlauncherdemo Initialization provider" 2023-05-10 20:18:09 +00:00
Anvesh Renikindi
4b48ea39e3 Added shortcutlauncherdemo Initialization provider
Bug: 277943394
Change-Id: I4a87f0539e1f269b5990acd522ba3916fdb6fe56
Test: None
2023-05-10 18:57:52 +00:00
Adrian Roos
1ab4b5f1c8 Merge "[Monkey][Bugfix] Do not report crash in monkey proc." am: f2384e9621 am: 2a690dd230
Original change: https://android-review.googlesource.com/c/platform/development/+/2579611

Change-Id: I5d8a69a5e8492dcc06419cd686cf1c8d2976fa55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 11:23:50 +00:00
Adrian Roos
2a690dd230 Merge "[Monkey][Bugfix] Do not report crash in monkey proc." am: f2384e9621
Original change: https://android-review.googlesource.com/c/platform/development/+/2579611

Change-Id: Id19d3deb246730d5d98f2f690c1ee6aaedd43b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:45:53 +00:00
Adrian Roos
f2384e9621 Merge "[Monkey][Bugfix] Do not report crash in monkey proc." 2023-05-10 10:01:59 +00:00
qinyige1
f2a198dd83 [Monkey][Bugfix] Do not report crash in monkey proc.
It's not necessary to report crash to system for monkey process,
which even causes system deadlock. So we override it.

Bug: 279527651
Test: Manual
Change-Id: I2672a372dfe445a4f2400db01ec837ec6b528303
2023-05-04 15:11:08 +08:00
Treehugger Robot
dd54efbcfd Merge "Add a Python package for fetch_artifact." am: 9af4718984 am: 3a4e649a1f
Original change: https://android-review.googlesource.com/c/platform/development/+/2056220

Change-Id: I9b1c3f87a0b4f85288d444fe14403ba04df715ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:24:50 +00:00
Treehugger Robot
3a4e649a1f Merge "Add a Python package for fetch_artifact." am: 9af4718984
Original change: https://android-review.googlesource.com/c/platform/development/+/2056220

Change-Id: Ifc5e1d3447ba8384864353d72bdf763780026ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:45:10 +00:00
Treehugger Robot
9af4718984 Merge "Add a Python package for fetch_artifact." 2023-04-26 21:03:19 +00:00
Treehugger Robot
76216aae08 Merge "Generate license module from the vendor snapshot update.py" am: 4b636d2df0 am: 69c125945f
Original change: https://android-review.googlesource.com/c/platform/development/+/2542492

Change-Id: I657f1e38c24a540f229c099595536627aa33160e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:02:27 +00:00
Treehugger Robot
69c125945f Merge "Generate license module from the vendor snapshot update.py" am: 4b636d2df0
Original change: https://android-review.googlesource.com/c/platform/development/+/2542492

Change-Id: I2ef8d7b2419a8f164633711bf6e3dd66871eaef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:36:29 +00:00
Treehugger Robot
4b636d2df0 Merge "Generate license module from the vendor snapshot update.py" 2023-04-26 01:53:02 +00:00
Justin Yun
fc27ecc025 Generate license module from the vendor snapshot update.py
`notice` property is removed from the soong. The update.py script
will generate `license` module, instead.
It will use the information included in the snapshot json files.

Bug: 271539873
Test: generate all kinds of snapshots and build against them
Change-Id: I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7
2023-04-26 00:30:43 +00:00
Hsin-Yi Chen
9b476625c6 Merge "Add README about opt-in ABI dumps" am: 934663b2f0 am: ffbbed4edf
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: I516b812920d31aba61432a388495001bc34ce8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:48:02 +00:00
Hsin-Yi Chen
ffbbed4edf Merge "Add README about opt-in ABI dumps" am: 934663b2f0
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: Ic7b9b3446c7290f12a565c30f3cfb1c17c7ca31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:09:00 +00:00
Hsin-Yi Chen
934663b2f0 Merge "Add README about opt-in ABI dumps" 2023-04-25 10:24:17 +00:00
Xin Li
cec2a12bde [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 9e96ca15ed -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: Id4ecfc7855b8e17c4e0d5b0df1ded621ed98561c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:17:46 +00:00
Xin Li
127a539b4d [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fa48b40c3b -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: I8515a9cbbfc64b2bb7ce1372b03e6d90a2ab271a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:29 +00:00
Xin Li
9e96ca15ed Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:07 +00:00
Shaju Mathew
56c4b1da4e Merge "Package version bump for U." am: 93396b2b35 am: 43f211f029
Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: I6b5b6b5c0670525a97c34cb65596ba42f0214d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:54:36 +00:00
Shaju Mathew
43f211f029 Merge "Package version bump for U." am: 93396b2b35
Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: Ic67c0bd6850cb1f361fb3a7789e908515601b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:16:12 +00:00
Shaju Mathew
93396b2b35 Merge "Package version bump for U." 2023-04-20 19:36:53 +00:00
Shaju Mathew
faf2b3d078 Package version bump for U.
Test: treehugger

Bug: 279028960
Change-Id: Ie0553922f6c67bd9c15cb375ba335b646089a4ad
2023-04-20 16:44:06 +00:00
Inseob Kim
8992d6a493 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda am: 520456adc1
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: If2eb25fc91b683cb71a2f672a74cca127ec66848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 09:04:58 +00:00
Inseob Kim
520456adc1 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: I277302b4c37c9a0d6264629318df12a55c3955d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:24:24 +00:00
Inseob Kim
02b3862cda Merge "Add min_sdk_version prop to snapshots" 2023-04-20 07:36:58 +00:00
Junghoon Jang
d1a1bdc184 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f am: 055ae89408
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: Ie3ed911284c55e5fa46af95a51015b3e9ab47e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 12:18:55 +00:00
Junghoon Jang
055ae89408 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: I1a893e625817888e3c576de68c509387d3c47cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 11:38:51 +00:00