From 872a144dca543f40ee232f26e0233e580d97e86d Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Mon, 27 Apr 2020 17:08:37 +0100 Subject: 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 --- apex/apex_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index d30b4292b..d52054479 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -504,7 +504,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") @@ -818,7 +818,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") -- cgit v1.2.3-59-g8ed1b