diff options
| author | 2024-12-11 00:40:51 +0000 | |
|---|---|---|
| committer | 2024-12-11 00:40:51 +0000 | |
| commit | aecbbc24dea1a92b8ce7eab4fb88de128f4e46b7 (patch) | |
| tree | 547ab24d81c43fe816961d073222d9c0424f0eb0 /apex/apex_test.go | |
| parent | cbcc9091842356f0e3cf53c779a760397a5fdf98 (diff) | |
| parent | c4179b5f7fc5e6de0ce27d9583ff5edfc93389c0 (diff) | |
Merge "Convert checkApexAvailability to use ModuleProxy." into main am: c4179b5f7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3400526
Change-Id: I1baae4c7e131522be7cc95440c948b58c16db6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index dd55152bf..b349081c6 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", |