diff options
| -rw-r--r-- | apex/apex_test.go | 3 | ||||
| -rw-r--r-- | cc/cc_test.go | 9 | ||||
| -rw-r--r-- | cc/vndk.go | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 97600b6c5..add07a6ba 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -1626,7 +1626,6 @@ func TestVndkApexCurrent(t *testing.T) { "etc/vndkcore.libraries.VER.txt", "etc/vndksp.libraries.VER.txt", "etc/vndkprivate.libraries.VER.txt", - "etc/vndkcorevariant.libraries.VER.txt", }) } @@ -1687,7 +1686,7 @@ func TestVndkApexWithPrebuilt(t *testing.T) { func vndkLibrariesTxtFiles(vers ...string) (result string) { for _, v := range vers { if v == "current" { - for _, txt := range []string{"llndk", "vndkcore", "vndksp", "vndkprivate", "vndkcorevariant"} { + for _, txt := range []string{"llndk", "vndkcore", "vndksp", "vndkprivate"} { result += ` vndk_libraries_txt { name: "` + txt + `.libraries.txt", diff --git a/cc/cc_test.go b/cc/cc_test.go index 1e70529bf..4d02f4f62 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -295,7 +295,14 @@ func checkVndkOutput(t *testing.T, ctx *android.TestContext, output string, expe func checkVndkLibrariesOutput(t *testing.T, ctx *android.TestContext, module string, expected []string) { t.Helper() vndkLibraries := ctx.ModuleForTests(module, "") - output := insertVndkVersion(module, "VER") + + var output string + if module != "vndkcorevariant.libraries.txt" { + output = insertVndkVersion(module, "VER") + } else { + output = module + } + checkWriteFileOutput(t, vndkLibraries.Output(output), expected) } diff --git a/cc/vndk.go b/cc/vndk.go index e4453eb2f..872a473a6 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -42,7 +42,6 @@ func VndkLibrariesTxtModules(vndkVersion string) []string { vndkCoreLibrariesTxt, vndkSpLibrariesTxt, vndkPrivateLibrariesTxt, - vndkUsingCoreVariantLibrariesTxt, } } // Snapshot vndks have their own *.libraries.VER.txt files. @@ -227,7 +226,7 @@ var ( vndkSpLibrariesKey = android.NewOnceKey("vndkSpLibrarires") llndkLibrariesKey = android.NewOnceKey("llndkLibrarires") vndkPrivateLibrariesKey = android.NewOnceKey("vndkPrivateLibrarires") - vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibrarires") + vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibraries") vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey") vndkLibrariesLock sync.Mutex @@ -445,7 +444,13 @@ func (txt *vndkLibrariesTxt) GenerateAndroidBuildActions(ctx android.ModuleConte return } - filename := insertVndkVersion(txt.Name(), ctx.DeviceConfig().PlatformVndkVersion()) + var filename string + if txt.Name() != vndkUsingCoreVariantLibrariesTxt { + filename = insertVndkVersion(txt.Name(), ctx.DeviceConfig().PlatformVndkVersion()) + } else { + filename = txt.Name() + } + txt.outputFile = android.PathForModuleOut(ctx, filename).OutputPath ctx.Build(pctx, android.BuildParams{ Rule: android.WriteFile, |