diff options
| author | Artur Satayev <satayev@google.com> | 2020-04-27 17:08:37 +0100 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2020-05-05 16:19:07 +0000 |
| commit | 334b51730aa2fe64a55dd6bf4e139f97448cc7b8 (patch) | |
| tree | bbd405d500180cdeef13ceb5088501d8ae01a92d /apex/apex_test.go | |
| parent | 5d5804a81f9535e4a497dc524fef01be0e8b1f9a (diff) | |
| download | build_soong-334b51730aa2fe64a55dd6bf4e139f97448cc7b8.tar.gz build_soong-334b51730aa2fe64a55dd6bf4e139f97448cc7b8.tar.bz2 build_soong-334b51730aa2fe64a55dd6bf4e139f97448cc7b8.zip | |
Export depsInfo into android package.
Move depsInfo into android for easier sharing with APK code.
Bug: 149622332
Test: m, diff'ing outputs for conscrypt module.
Change-Id: If0ee967d37425540e69b4ce9304229d9f2cd86bd
Merged-In: If0ee967d37425540e69b4ce9304229d9f2cd86bd
Exempt-From-Owner-Approval: cp from aosp
(cherry picked from commit 872a144dca543f40ee232f26e0233e580d97e86d)
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index f1d80ae8..f0e7ff3c 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -478,7 +478,7 @@ func TestBasicApex(t *testing.T) { ensureListContains(t, noticeInputs, "custom_notice") ensureListContains(t, noticeInputs, "custom_notice_for_static_lib") - depsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("myapex-deps-info.txt").Args["content"], "\\n") + depsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") ensureListContains(t, depsInfo, "myjar <- myapex") ensureListContains(t, depsInfo, "mylib <- myapex") ensureListContains(t, depsInfo, "mylib2 <- mylib") @@ -784,7 +784,7 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { // Ensure that libfoo stubs is not linking to libbar (since it is a stubs) ensureNotContains(t, libFooStubsLdFlags, "libbar.so") - depsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("myapex2-deps-info.txt").Args["content"], "\\n") + depsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") ensureListContains(t, depsInfo, "mylib <- myapex2") ensureListContains(t, depsInfo, "libbaz <- mylib") |