From b73c3a6d221523f06d30c15145866056556187d0 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 10 Dec 2024 00:58:06 +0000 Subject: Convert checkApexAvailability to use ModuleProxy. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I7582db8e22e94d0a9db7715a76bb6ed34c166a4e --- apex/apex_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 282cd1dd3..12cf6a693 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -6353,10 +6353,16 @@ func TestApexAvailable_IndirectDep(t *testing.T) { testApexError(t, `requires "libbaz" that doesn't list the APEX under 'apex_available'.\n\nDependency path: .*via tag apex\.dependencyTag\{"sharedLib"\} .*-> libfoo.*link:shared.* +.*via tag cc\.dependencyTag.* +.*-> libfoo.*link:static.* .*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.* .*-> libbar.*link:shared.* +.*via tag cc\.dependencyTag.* +.*-> libbar.*link:static.* .*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.* -.*-> libbaz.*link:shared.*`, ` +.*-> libbaz.*link:shared.* +.*via tag cc\.dependencyTag.* +.*-> libbaz.*link:static.*`, ` apex { name: "myapex", key: "myapex.key", -- cgit v1.2.3-59-g8ed1b