diff options
| author | 2020-04-27 18:53:18 +0100 | |
|---|---|---|
| committer | 2020-05-04 19:44:28 +0100 | |
| commit | 480e25b74f9e7101ff3083bd4517f15ac0a6a1b9 (patch) | |
| tree | 7e7a1959c654c4019f6188f60bc5138a4ca40390 /apex/apex_test.go | |
| parent | a8bd113a695dfb77695cdff7f72719a08869fc23 (diff) | |
Introduce min_sdk_version to deps info.
Bug: 149622332
Test: m
Change-Id: Ie6568cb8a82d5cca9a3dc91b5a068abf4b0632dc
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index de04dce2f..ce39b39e4 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -505,18 +505,18 @@ func TestBasicApex(t *testing.T) { ensureListContains(t, noticeInputs, "custom_notice_for_static_lib") fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") - ensureListContains(t, fullDepsInfo, "myjar <- myapex") - ensureListContains(t, fullDepsInfo, "mylib <- myapex") - ensureListContains(t, fullDepsInfo, "mylib2 <- mylib") - ensureListContains(t, fullDepsInfo, "myotherjar <- myjar") - ensureListContains(t, fullDepsInfo, "mysharedjar (external) <- myjar") + 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") - ensureListContains(t, flatDepsInfo, " mylib") - ensureListContains(t, flatDepsInfo, " mylib2") - ensureListContains(t, flatDepsInfo, " myotherjar") - ensureListContains(t, flatDepsInfo, " mysharedjar (external)") + 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)") } func TestDefaults(t *testing.T) { @@ -826,14 +826,14 @@ 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 <- myapex2") - ensureListContains(t, fullDepsInfo, "libbaz <- mylib") - ensureListContains(t, fullDepsInfo, "libfoo (external) <- mylib") + 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") - ensureListContains(t, flatDepsInfo, " libbaz") - ensureListContains(t, flatDepsInfo, " libfoo (external)") + ensureListContains(t, flatDepsInfo, " mylib(minSdkVersion:(no version))") + ensureListContains(t, flatDepsInfo, " libbaz(minSdkVersion:(no version))") + ensureListContains(t, flatDepsInfo, " libfoo(minSdkVersion:(no version)) (external)") } func TestApexWithRuntimeLibsDependency(t *testing.T) { |