Merge "Move LLNDK ABI dumps from vndk/ to platform/"
This commit is contained in:
@@ -1474,7 +1474,7 @@ func pathForModuleOut(ctx ModuleOutPathContext) OutputPath {
|
|||||||
// PathForVndkRefAbiDump returns an OptionalPath representing the path of the
|
// PathForVndkRefAbiDump returns an OptionalPath representing the path of the
|
||||||
// reference abi dump for the given module. This is not guaranteed to be valid.
|
// reference abi dump for the given module. This is not guaranteed to be valid.
|
||||||
func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string,
|
func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string,
|
||||||
isNdk, isLlndkOrVndk, isGzip bool) OptionalPath {
|
isNdk, isVndk, isGzip bool) OptionalPath {
|
||||||
|
|
||||||
currentArchType := ctx.Arch().ArchType
|
currentArchType := ctx.Arch().ArchType
|
||||||
primaryArchType := ctx.Config().DevicePrimaryArchType()
|
primaryArchType := ctx.Config().DevicePrimaryArchType()
|
||||||
@@ -1486,7 +1486,7 @@ func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName strin
|
|||||||
var dirName string
|
var dirName string
|
||||||
if isNdk {
|
if isNdk {
|
||||||
dirName = "ndk"
|
dirName = "ndk"
|
||||||
} else if isLlndkOrVndk {
|
} else if isVndk {
|
||||||
dirName = "vndk"
|
dirName = "vndk"
|
||||||
} else {
|
} else {
|
||||||
dirName = "platform" // opt-in libs
|
dirName = "platform" // opt-in libs
|
||||||
|
@@ -1594,10 +1594,10 @@ func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath {
|
|||||||
func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {
|
func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {
|
||||||
// The logic must be consistent with classifySourceAbiDump.
|
// The logic must be consistent with classifySourceAbiDump.
|
||||||
isNdk := ctx.isNdk(ctx.Config())
|
isNdk := ctx.isNdk(ctx.Config())
|
||||||
isLlndkOrVndk := ctx.IsLlndkPublic() || (ctx.useVndk() && ctx.isVndk())
|
isVndk := ctx.useVndk() && ctx.isVndk()
|
||||||
|
|
||||||
refAbiDumpTextFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isLlndkOrVndk, false)
|
refAbiDumpTextFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, false)
|
||||||
refAbiDumpGzipFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isLlndkOrVndk, true)
|
refAbiDumpGzipFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, true)
|
||||||
|
|
||||||
if refAbiDumpTextFile.Valid() {
|
if refAbiDumpTextFile.Valid() {
|
||||||
if refAbiDumpGzipFile.Valid() {
|
if refAbiDumpGzipFile.Valid() {
|
||||||
|
Reference in New Issue
Block a user