Commit Graph

33990 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Junghoon Jang
e4f118be6f Merge "repo-pull: Introduce --ignore-unknown-changes arg" 2023-04-19 10:55:11 +00:00
Xin Li
fa48b40c3b Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1
Change-Id: I948361782cc4d58a5c2b7528bfadfa0e5d97dcd7
2023-04-18 16:31:54 -07:00
Junghoon Jang
ac6afae3d6 repo-pull: Introduce --ignore-unknown-changes arg
In the case of pulling changes of a topic which is shared by multiple
repos, if the target source tree doesn't contain all of those repos,
the script will fail to apply changes.

Introduce a new argument, --ignore-unknown-changes, which ignores
changes whose repo is not in the manifest.xml.

Test: Pulling changes of a topic which is shared by multiple repos to
  the source tree which contains part of those repos was done
  successfully with the newly introduce argument.
Change-Id: Ie999121415bc1888b714d023ca251ad89701df11
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
2023-04-18 15:52:07 +00:00
Inseob Kim
46628fff98 Add min_sdk_version prop to snapshots
Bug: 277403349
Test: build vndk/vendor snapshot and build
Change-Id: I460c69cbc5820132690c9d3fb325c5eb504f5366
2023-04-18 16:50:20 +09:00
Treehugger Robot
b7e7077c5e Merge "VNDK snapshot tool generates license information from json" am: c973f68913
Original change: https://android-review.googlesource.com/c/platform/development/+/2539710

Change-Id: I305a66da391ecd89d16b32edc54446ff8a5d140e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 06:10:03 +00:00
Treehugger Robot
c973f68913 Merge "VNDK snapshot tool generates license information from json" 2023-04-18 05:33:10 +00:00
Justin Yun
9e48f54e06 VNDK snapshot tool generates license information from json
VNDK snapshot zip file includes license information in json files.
Instead of parsing the license text files, read the information from
the json files.
VNDK snapshot v33 and older do not include this information and must
parse the license text files as before.

Bug: 277317599
Test: generate snapshots with/without json information && m nothing
Change-Id: Ibdbc571c9effe6c17f5d82a7a0894ad2d800711f
2023-04-17 15:47:24 +09:00
Junghoon Jang
8e297e0ad6 Merge changes Iff3cdebe,I9d1add4f am: 40e23904e3
Original change: https://android-review.googlesource.com/c/platform/development/+/2530760

Change-Id: I22dea55d2aef31490cf57801f0d88cce0ef98082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 05:44:09 +00:00
Junghoon Jang
40e23904e3 Merge changes Iff3cdebe,I9d1add4f
* changes:
  repo-pull: Introduce --current-branch argument
  repo-pull: Consider branch of repo
2023-04-17 05:15:57 +00:00
Hsin-Yi Chen
ad092ec244 Merge "Fix the internal type of enum values" am: 74e23a1ec1
Original change: https://android-review.googlesource.com/c/platform/development/+/2530761

Change-Id: I6b5df899cf359e4898bf87d583012898f9832766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 03:12:21 +00:00
Hsin-Yi Chen
74e23a1ec1 Merge "Fix the internal type of enum values" 2023-04-17 02:37:43 +00:00
Dan Albert
d9f4d6f651 Add a Python package for fetch_artifact.
We keep duplicating this function all over the place. Factor it out
and modernize it.

Test: all the test commands named in the readme
Bug: None
Change-Id: I8d90a9c101b9cf83d62d02141f40c6c3666bdf94
2023-04-14 14:30:43 -07:00
Junghoon Jang
108c36c52b repo-pull: Introduce --current-branch argument
To make the script can be used from automatic scripts, introduce
`--current-branch` argument which allows pulling commits to the current
branch without creating a local branch. It will skip the prompt which
asking about the creation of a local branch.

Test: With --current-branch argument, the script doesn't ask setting
  local branch name.
Change-Id: Iff3cdebe6338bb2be738e60047d5c4dd81cde4f0
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
2023-04-14 12:25:29 +00:00
Junghoon Jang
172ccfe52d repo-pull: Consider branch of repo
In the case of one source tree containing multiple repos with the same
project, but different branches, the script won't sync them properly.
To fix it, make it consider the branch along with the project.

Test: Tested syncing well in the directory which contains multiple repos
  with the same project, but different branches.
Change-Id: I9d1add4ffe85f80f8f9d6a3ae2c046473d7c4631
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
2023-04-14 12:24:51 +00:00
Hsin-Yi Chen
35fabff46a Add README about opt-in ABI dumps
- Add the commands to write Android.bp, create reference dumps, and
  find the generated dumps.
- Remove "persistent-" from the repo command as it's internal only.

Test: None
Bug: 227282691
Change-Id: I07dc947c0436e2a0e7e5b3a4f812800bd7df2720
2023-04-14 19:31:49 +08:00