Merge "Clean up LLNDK stubs" into main am: ed9005b556 am: 452797c6f7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2999576

Change-Id: Ica847f7a869dbd631e27b084415788547ad88ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2024-03-14 04:50:09 +00:00
committed by Automerger Merge Worker
3 changed files with 7 additions and 10 deletions

View File

@@ -2068,7 +2068,7 @@ func TestApexMinSdkVersion_InVendorApex(t *testing.T) {
// Ensure that mylib links with "current" LLNDK
libFlags := names(mylib.Rule("ld").Args["libFlags"])
ensureListContains(t, libFlags, "out/soong/.intermediates/libbar/"+vendorVariant+"_shared_current/libbar.so")
ensureListContains(t, libFlags, "out/soong/.intermediates/libbar/"+vendorVariant+"_shared/libbar.so")
// Ensure that mylib is targeting 29
ccRule := ctx.ModuleForTests("mylib", vendorVariant+"_static_apex29").Output("obj/mylib.o")