diff options
author | Cole Faust <colefaust@google.com> | 2023-11-15 02:10:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-15 02:10:47 +0000 |
commit | 55765f77f8f9328eeebddf785ca24e1d4b5464e6 (patch) | |
tree | 46c8c6c51a3bb51c7abadce4b9033025d596b15d | |
parent | e3c4b9038b6043330297cbd0b692446767223a04 (diff) | |
parent | 9c6c31c639326f9239b2a334d433ab8ce649fc9d (diff) | |
download | uwb-55765f77f8f9328eeebddf785ca24e1d4b5464e6.tar.gz |
Sandbox uwb genrules am: 68a3dea0c4 am: a0b140bc79 am: 9c6c31c639
Original change: https://android-review.googlesource.com/c/platform/external/uwb/+/2830334
Change-Id: Ic36a55dbff104f622fc55d0b624535504a3ef3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | src/Android.bp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Android.bp b/src/Android.bp index 16cb3a1..500bbd1 100755 --- a/src/Android.bp +++ b/src/Android.bp @@ -210,7 +210,6 @@ genrule { tools: ["aprotoc", "protoc-gen-rust"], cmd: "$(location aprotoc)" + " --proto_path=`dirname $(in)`" + - " --dependency_out=$(depfile)" + " --plugin=protoc-gen-rust=$(location protoc-gen-rust)" + " --rust_out=$(genDir) $(in)", srcs: [ @@ -219,7 +218,6 @@ genrule { out: [ "uwb_service.rs", ], - depfile: true, } genrule { @@ -363,23 +361,28 @@ genrule { "pdlc", "soong_zip", ], + srcs: [ + "rust/uwb_core/**/*", + "rust/uwb_uci_packets/**/*", + "rust/Cargo.toml", + ], cmd: // Create a artifacts directory and copy the source code into it. - "mkdir $(genDir)/artifacts;" + + "mkdir $(genDir)/artifacts && " + "cp -r external/uwb/src/rust/uwb_core " + " external/uwb/src/rust/uwb_uci_packets " + " external/uwb/src/rust/Cargo.toml " + - " $(genDir)/artifacts;" + + " $(genDir)/artifacts && " + // Generate uci_packets.rs at $(genDir)/artifacts/uwb_uci_packets/. "$(location pdlc) --output-format rust " + " external/uwb/src/rust/uwb_uci_packets/uci_packets.pdl " + - " > $(genDir)/artifacts/uwb_uci_packets/uci_packets.rs;" + + " > $(genDir)/artifacts/uwb_uci_packets/uci_packets.rs && " + // Pack the artifacts directory and clean up the directory. "$(location soong_zip) -o $(out) " + " -C $(genDir)/artifacts " + - " -D $(genDir)/artifacts;" + + " -D $(genDir)/artifacts && " + "rm -rf $(genDir)/artifacts", out: [ "uwb_core_artifacts.zip", |