diff options
| author | Artur Satayev <satayev@google.com> | 2021-03-11 18:03:42 +0000 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2021-03-11 18:13:18 +0000 |
| commit | 533b98cde31684fc5eeaef647ade0c018860c302 (patch) | |
| tree | 830cf88a866c433f60e640fb7c0b95bb8f58be7a /apex/apex_test.go | |
| parent | a55aefd57b5e3aa89648cfc5bca8dcb9eb8322f3 (diff) | |
| download | soong-533b98cde31684fc5eeaef647ade0c018860c302.tar.gz | |
Don't track modules that are only available to APEXes.
Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.
Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
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 08f54f724..a8c691374 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -432,7 +432,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"], @@ -440,14 +440,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"], @@ -642,14 +642,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)") @@ -1148,13 +1146,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)") } |