StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6acea9d31b102a0d3476b737532716e4bddafe3d
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:34:55 +00:00
committed by Automerger Merge Worker
parent b7349577b4 ed9005b556
commit 452797c6f7
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -2068,7 +2068,7 @@ func TestApexMinSdkVersion_InVendorApex(t *testing.T) {
// Ensure that mylib links with "current" LLNDK // Ensure that mylib links with "current" LLNDK
libFlags := names(mylib.Rule("ld").Args["libFlags"]) 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 // Ensure that mylib is targeting 29
ccRule := ctx.ModuleForTests("mylib", vendorVariant+"_static_apex29").Output("obj/mylib.o") ccRule := ctx.ModuleForTests("mylib", vendorVariant+"_static_apex29").Output("obj/mylib.o")

2
cc/cc_test.go
View File

@@ -2680,9 +2680,7 @@ func TestLlndkLibrary(t *testing.T) {
} }
} }
expected := []string{ expected := []string{
"android_vendor.29_arm64_armv8-a_shared_current",
"android_vendor.29_arm64_armv8-a_shared", "android_vendor.29_arm64_armv8-a_shared",
"android_vendor.29_arm_armv7-a-neon_shared_current",
"android_vendor.29_arm_armv7-a-neon_shared", "android_vendor.29_arm_armv7-a-neon_shared",
} }
android.AssertArrayString(t, "variants for llndk stubs", expected, actual) android.AssertArrayString(t, "variants for llndk stubs", expected, actual)

13
cc/library.go
View File

@@ -1915,12 +1915,15 @@ func (library *libraryDecorator) stubsVersions(ctx android.BaseMutatorContext) [
} }
if library.hasLLNDKStubs() && ctx.Module().(*Module).InVendorOrProduct() { if library.hasLLNDKStubs() && ctx.Module().(*Module).InVendorOrProduct() {
// LLNDK libraries only need a single stubs variant. // LLNDK libraries only need a single stubs variant (""), which is
return []string{android.FutureApiLevel.String()} // added automatically in createVersionVariations().
return nil
} }
// Future API level is implicitly added if there isn't // Future API level is implicitly added if there isn't
return addCurrentVersionIfNotPresent(library.Properties.Stubs.Versions) versions := addCurrentVersionIfNotPresent(library.Properties.Stubs.Versions)
normalizeVersions(ctx, versions)
return versions
} }
func addCurrentVersionIfNotPresent(vers []string) []string { func addCurrentVersionIfNotPresent(vers []string) []string {
@@ -2292,10 +2295,6 @@ func setStubsVersions(mctx android.BottomUpMutatorContext, library libraryInterf
return return
} }
versions := library.stubsVersions(mctx) versions := library.stubsVersions(mctx)
if len(versions) <= 0 {
return
}
normalizeVersions(mctx, versions)
if mctx.Failed() { if mctx.Failed() {
return return
} }