Blaster4385/adevtool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: Disable Soong for modules with cross-partition conflicts

Browse source
This commit is contained in:
Danny Lin 2021-11-11 00:04:42 -08:00
parent 800822a9d8
commit 5103d18865
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/blobs/build.ts
View file

@ -2,7 +2,7 @@ import * as path from 'path'
import { promises as fs } from 'fs'
import { blobToFileCopy, BoardMakefile, ModulesMakefile, ProductMakefile, sanitizeBasename, serializeBoardMakefile, serializeModulesMakefile, serializeProductMakefile, Symlink } from '../build/make'
import { blobToSoongModule, serializeBlueprint, SharedLibraryModule, SoongBlueprint, SoongModule, SPECIAL_FILE_EXTENSIONS } from '../build/soong'
import { blobToSoongModule, serializeBlueprint, SharedLibraryModule, SoongBlueprint, SoongModule, SPECIAL_FILE_EXTENSIONS, TYPE_SHARED_LIBRARY } from '../build/soong'
import { BlobEntry, blobNeedsSoong } from './entry'
export interface BuildFiles {
@ -71,13 +71,21 @@ export async function generateBuild(
// If already exists: skip if it's the other arch variant of a library in
// the same partition AND has the same name (incl. ext), otherwise rename the
// module to avoid conflict
let needsMakeFallback = false
if (namedModules.has(name)) {
let conflictModule = namedModules.get(name)!
if (conflictModule._type == 'cc_prebuilt_library_shared' &&
if (conflictModule._type == TYPE_SHARED_LIBRARY &&
(conflictModule as SharedLibraryModule).compile_multilib == 'both' &&
conflictModule._entry?.partition == entry.partition &&
conflictModule._entry?.path.split('/').at(-1) == pathParts.at(-1)) {
// Same partition = skip arch variant
if (conflictModule._entry?.partition == entry.partition) {
continue
} else {
// Fall back to PRODUCT_COPY_FILES for cross-partition conflicts.
// TODO: resolve cross-platform conflicts without overrides
needsMakeFallback = true
}
}
// Increment conflict counter and append to name
@ -86,15 +94,18 @@ export async function generateBuild(
name += `__${conflictNum}`
}
if (!needsMakeFallback) {
let module = blobToSoongModule(name, ext, vendor, entry, entrySrcPaths)
namedModules.set(name, module)
} else {
// Other files -> Kati Makefile
continue
}
}
// Other files (and failed Soong files) -> Kati Makefile
// Simple PRODUCT_COPY_FILES line
copyFiles.push(blobToFileCopy(entry, proprietaryDir))
}
}
let buildPackages = Array.from(namedModules.keys())
buildPackages.push(...symlinks.map(l => l.moduleName))

4
src/build/soong.ts
View file

@ -10,6 +10,8 @@ export const SPECIAL_FILE_EXTENSIONS = new Set([
'.apex',
])
export const TYPE_SHARED_LIBRARY = 'cc_prebuilt_library_shared'
export interface TargetSrcs {
srcs: Array<string>
}
@ -204,7 +206,7 @@ export function blobToSoongModule(
let origFileName = pathParts.at(-1)?.replace(/\.so$/, '')
moduleSpecific = {
_type: 'cc_prebuilt_library_shared',
_type: TYPE_SHARED_LIBRARY,
...(name != origFileName && { stem: origFileName }),
...(relPath && { relative_install_path: relPath }),
strip: {