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

generate-full: Add missing vintf manifests

Browse source
This commit is contained in:
Danny Lin 2021-11-13 18:46:55 -08:00
parent 8d32be55a6
commit b415b86787
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/commands/generate-full.ts
View file

@ -9,6 +9,7 @@ import { combinedPartPathToEntry, diffLists, listPart, serializeBlobList } from
import { diffPartOverlays, parsePartOverlayApks, serializePartOverlays } from '../blobs/overlays' import { diffPartOverlays, parsePartOverlayApks, serializePartOverlays } from '../blobs/overlays'
import { parsePresignedRecursive, updatePresignedBlobs } from '../blobs/presigned' import { parsePresignedRecursive, updatePresignedBlobs } from '../blobs/presigned'
import { diffPartitionProps, filterPartPropKeys, loadPartitionProps } from '../blobs/props' import { diffPartitionProps, filterPartPropKeys, loadPartitionProps } from '../blobs/props'
import { diffPartVintfManifests, loadPartVintfInfo, writePartVintfManifests } from '../blobs/vintf'
import { findOverrideModules } from '../build/overrides' import { findOverrideModules } from '../build/overrides'
import { parseModuleInfo, removeSelfModules } from '../build/soong-info' import { parseModuleInfo, removeSelfModules } from '../build/soong-info'
import { parseDeviceConfig } from '../config/device' import { parseDeviceConfig } from '../config/device'
@ -49,13 +50,11 @@ export default class GenerateFull extends Command {
let namedEntries = new Map<string, BlobEntry>() let namedEntries = new Map<string, BlobEntry>()
// Prepare output directories // Prepare output directories
let {proprietaryDir, fwDir, overlaysDir} = await createVendorDirs(config.device.vendor, config.device.name) let {proprietaryDir, fwDir, overlaysDir, vintfDir} = await createVendorDirs(config.device.vendor, config.device.name)
// 1. Diff files // 1. Diff files
let spinner = startActionSpinner('Enumerating files') let spinner = startActionSpinner('Enumerating files')
for (let partition of ALL_PARTITIONS) { for (let partition of ALL_PARTITIONS) {
spinner.text = partition
let filesRef = await listPart(partition, stockRoot) let filesRef = await listPart(partition, stockRoot)
if (filesRef == null) continue if (filesRef == null) continue
let filesNew = customState != null ? customState.partitionFiles[partition] : let filesNew = customState != null ? customState.partitionFiles[partition] :
@ -68,6 +67,8 @@ export default class GenerateFull extends Command {
let entry = combinedPartPathToEntry(partition, combinedPartPath) let entry = combinedPartPathToEntry(partition, combinedPartPath)
namedEntries.set(combinedPartPath, entry) namedEntries.set(combinedPartPath, entry)
} }
spinner.text = partition
} }
stopActionSpinner(spinner) stopActionSpinner(spinner)
@ -156,10 +157,17 @@ export default class GenerateFull extends Command {
}) })
let missingOverlays = diffPartOverlays(stockOverlays, customOverlays) let missingOverlays = diffPartOverlays(stockOverlays, customOverlays)
let overlayPkgs = await serializePartOverlays(missingOverlays, overlaysDir) let overlayPkgs = await serializePartOverlays(missingOverlays, overlaysDir)
console.log(missingOverlays)
stopActionSpinner(spinner) stopActionSpinner(spinner)
// 8. Firmware // 8. vintf manifests
spinner = startActionSpinner('Extracting vintf manifests')
let customVintf = customState?.partitionVintfInfo ?? await loadPartVintfInfo(customRoot)
let stockVintf = await loadPartVintfInfo(stockRoot)
let missingHals = diffPartVintfManifests(customVintf, stockVintf)
let vintfManifestPaths = await writePartVintfManifests(missingHals, vintfDir)
stopActionSpinner(spinner)
// 9. Firmware
let fwPaths: Array<string> | null = null let fwPaths: Array<string> | null = null
if (factoryZip != undefined) { if (factoryZip != undefined) {
spinner = startActionSpinner('Extracting firmware') spinner = startActionSpinner('Extracting firmware')
@ -177,7 +185,7 @@ export default class GenerateFull extends Command {
stopActionSpinner(spinner) stopActionSpinner(spinner)
} }
// 9. Build files // 10. Build files
spinner = startActionSpinner('Generating build files') spinner = startActionSpinner('Generating build files')
let build = await generateBuild(entries, config.device.name, config.device.vendor, stockRoot, proprietaryDir) let build = await generateBuild(entries, config.device.name, config.device.vendor, stockRoot, proprietaryDir)
@ -195,6 +203,9 @@ export default class GenerateFull extends Command {
// Add SELinux policies // Add SELinux policies
build.boardMakefile.secontextResolutions = ctxResolutions build.boardMakefile.secontextResolutions = ctxResolutions
// Add vintf manifest XMLs
build.productMakefile.vintfManifestPaths = vintfManifestPaths
// Add firmware // Add firmware
if (fwPaths != null) { if (fwPaths != null) {
build.boardMakefile.boardInfo = `${fwDir}/${ANDROID_INFO}` build.boardMakefile.boardInfo = `${fwDir}/${ANDROID_INFO}`