diff options
| author | satayev <satayev@google.com> | 2021-03-15 12:47:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-15 12:47:00 +0000 |
| commit | 2338d6f6e479c0227d13f6eb25dda28ae5b87229 (patch) | |
| tree | 15a09c2088576d184ac1dec04fb5f413f42dbde0 /apex/apex_test.go | |
| parent | e5eb33b634fd8005f8bbce7e6e753fe3f4eb2720 (diff) | |
| parent | 533b98cde31684fc5eeaef647ade0c018860c302 (diff) | |
| download | soong-2338d6f6e479c0227d13f6eb25dda28ae5b87229.tar.gz | |
Merge "Don't track modules that are only available to APEXes."
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index f8d9aae63..dd290d3bd 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -522,7 +522,7 @@ func TestBasicApex(t *testing.T) { } rust_binary { - name: "foo.rust", + name: "foo.rust", srcs: ["foo.rs"], rlibs: ["libfoo.rlib.rust"], dylibs: ["libfoo.dylib.rust"], @@ -530,14 +530,14 @@ func TestBasicApex(t *testing.T) { } rust_library_rlib { - name: "libfoo.rlib.rust", + name: "libfoo.rlib.rust", srcs: ["foo.rs"], crate_name: "foo", apex_available: ["myapex"], } rust_library_dylib { - name: "libfoo.dylib.rust", + name: "libfoo.dylib.rust", srcs: ["foo.rs"], crate_name: "foo", apex_available: ["myapex"], @@ -732,14 +732,12 @@ func TestBasicApex(t *testing.T) { fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") ensureListContains(t, fullDepsInfo, " myjar(minSdkVersion:(no version)) <- myapex") - ensureListContains(t, fullDepsInfo, " mylib(minSdkVersion:(no version)) <- myapex") ensureListContains(t, fullDepsInfo, " mylib2(minSdkVersion:(no version)) <- mylib") ensureListContains(t, fullDepsInfo, " myotherjar(minSdkVersion:(no version)) <- myjar") ensureListContains(t, fullDepsInfo, " mysharedjar(minSdkVersion:(no version)) (external) <- myjar") flatDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/flatlist.txt").Args["content"], "\\n") ensureListContains(t, flatDepsInfo, "myjar(minSdkVersion:(no version))") - ensureListContains(t, flatDepsInfo, "mylib(minSdkVersion:(no version))") ensureListContains(t, flatDepsInfo, "mylib2(minSdkVersion:(no version))") ensureListContains(t, flatDepsInfo, "myotherjar(minSdkVersion:(no version))") ensureListContains(t, flatDepsInfo, "mysharedjar(minSdkVersion:(no version)) (external)") @@ -1238,13 +1236,9 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { ensureNotContains(t, libFooStubsLdFlags, "libbar.so") fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") - ensureListContains(t, fullDepsInfo, " mylib(minSdkVersion:(no version)) <- myapex2") - ensureListContains(t, fullDepsInfo, " libbaz(minSdkVersion:(no version)) <- mylib") ensureListContains(t, fullDepsInfo, " libfoo(minSdkVersion:(no version)) (external) <- mylib") flatDepsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("depsinfo/flatlist.txt").Args["content"], "\\n") - ensureListContains(t, flatDepsInfo, "mylib(minSdkVersion:(no version))") - ensureListContains(t, flatDepsInfo, "libbaz(minSdkVersion:(no version))") ensureListContains(t, flatDepsInfo, "libfoo(minSdkVersion:(no version)) (external)") } |