summaryrefslogtreecommitdiff
path: root/apex/apex_test.go
diff options
context:
space:
mode:
author Dennis Shen <dzshen@google.com> 2025-02-04 11:03:15 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 11:03:15 -0800
commit83678767c00a9bf79841a8e402f1f0aa5d3e2fc7 (patch)
treed4f03e1b4d5faf38e92e48424d9b9d5407d67923 /apex/apex_test.go
parent6d6db8ef16c0883323264b4a4b4670c751d83d8a (diff)
parentef72c1bea847fd67e181c79f88d0d07f3687d74b (diff)
Merge "Soong: remove codegen instrumentation" into main am: d945d131c7 am: ef72c1bea8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3469399 Change-Id: If2b2baefb38888a01bce920ceeadea7fffa68991 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r--apex/apex_test.go13
1 files changed, 2 insertions, 11 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go
index a5b66c10e..ffd0606e3 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -10823,15 +10823,6 @@ func TestAconfigFilesRustDeps(t *testing.T) {
}
rust_library {
- name: "libflags_rust", // test mock
- crate_name: "flags_rust",
- srcs: ["lib.rs"],
- apex_available: [
- "myapex",
- ],
- }
-
- rust_library {
name: "liblazy_static", // test mock
crate_name: "lazy_static",
srcs: ["src/lib.rs"],
@@ -10951,8 +10942,8 @@ func TestAconfigFilesRustDeps(t *testing.T) {
mod := ctx.ModuleForTests("myapex", "android_common_myapex")
s := mod.Rule("apexRule").Args["copy_commands"]
copyCmds := regexp.MustCompile(" *&& *").Split(s, -1)
- if len(copyCmds) != 34 {
- t.Fatalf("Expected 34 commands, got %d in:\n%s", len(copyCmds), s)
+ if len(copyCmds) != 32 {
+ t.Fatalf("Expected 32 commands, got %d in:\n%s", len(copyCmds), s)
}
ensureListContainsMatch(t, copyCmds, "^cp -f .*/aconfig_flags.pb .*/image.apex/etc/aconfig_flags.pb")