diff options
| author | 2020-12-22 18:55:34 +0000 | |
|---|---|---|
| committer | 2020-12-22 18:55:34 +0000 | |
| commit | 1f8c2729846b83e24c09292ef5739b13375f7c0c (patch) | |
| tree | e2ff82dd86e229cf58a518e6a3aec5dc9d810bdc /apex/apex_test.go | |
| parent | 0a2afd183a9bfeb04a57ebb22abfe7a2a4596af8 (diff) | |
| parent | 127bb8b9f6e0c224bb9240464b86f9db4e83ba83 (diff) | |
Merge changes from topic "llndk_cc_library"
* changes:
Don't rewrite LLNDK dependencies with .llndk suffix
Don't strip stub libraries
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 4a6aecfdf..cb43e2429 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -1355,9 +1355,9 @@ func TestApexDependsOnLLNDKTransitively(t *testing.T) { ensureListContains(t, names(apexManifestRule.Args["requireNativeLibs"]), "libbar.so") mylibLdFlags := ctx.ModuleForTests("mylib", "android_vendor.VER_arm64_armv8-a_shared_"+tc.apexVariant).Rule("ld").Args["libFlags"] - ensureContains(t, mylibLdFlags, "libbar.llndk/android_vendor.VER_arm64_armv8-a_shared_"+tc.shouldLink+"/libbar.so") + ensureContains(t, mylibLdFlags, "libbar/android_vendor.VER_arm64_armv8-a_shared_"+tc.shouldLink+"/libbar.so") for _, ver := range tc.shouldNotLink { - ensureNotContains(t, mylibLdFlags, "libbar.llndk/android_vendor.VER_arm64_armv8-a_shared_"+ver+"/libbar.so") + ensureNotContains(t, mylibLdFlags, "libbar/android_vendor.VER_arm64_armv8-a_shared_"+ver+"/libbar.so") } mylibCFlags := ctx.ModuleForTests("mylib", "android_vendor.VER_arm64_armv8-a_static_"+tc.apexVariant).Rule("cc").Args["cFlags"] |