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

generate-prep: Create temp dir and fix frontend API usage

Browse source
This commit is contained in:
Danny Lin 2021-12-16 17:42:08 -08:00
parent a940128fa8
commit bd4e56ac67
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/commands/generate-prep.ts
View file

@ -6,6 +6,7 @@ import { BlobEntry } from '../blobs/entry'
import { loadDeviceConfig } from '../config/device'
import { enumerateFiles, extractProps, generateBuildFiles, PropResults } from '../frontend/generate'
import { withSpinner } from '../util/cli'
import { withTempDir } from '../util/fs'
export default class GeneratePrep extends Command {
static description = 'generate vendor parts to prepare for reference AOSP build (e.g. for collect-state)'
@ -25,38 +26,41 @@ export default class GeneratePrep extends Command {
let config = await loadDeviceConfig(configPath)
// Each step will modify this. Key = combined part path
let namedEntries = new Map<string, BlobEntry>()
// tmp may be needed for mounting/extracting stock images
await withTempDir(async (tmp) => {
// Each step will modify this. Key = combined part path
let namedEntries = new Map<string, BlobEntry>()
// Prepare output directories
let dirs = await createVendorDirs(config.device.vendor, config.device.name)
// Prepare output directories
let dirs = await createVendorDirs(config.device.vendor, config.device.name)
// 1. Diff files
await withSpinner('Enumerating files', (spinner) =>
enumerateFiles(spinner, config.filters.dep_files, null, namedEntries, null,
stockSrc, null))
// 1. Diff files
await withSpinner('Enumerating files', (spinner) =>
enumerateFiles(spinner, config.filters.dep_files, null, namedEntries, null,
stockSrc))
// After this point, we only need entry objects
let entries = Array.from(namedEntries.values())
// After this point, we only need entry objects
let entries = Array.from(namedEntries.values())
// 2. Extract
// Copy blobs (this has its own spinner)
if (config.generate.files && !skipCopy) {
await copyBlobs(entries, stockSrc, dirs.proprietary)
}
// 2. Extract
// Copy blobs (this has its own spinner)
if (config.generate.files && !skipCopy) {
await copyBlobs(entries, stockSrc, dirs.proprietary)
}
// 3. Props
let propResults: PropResults | null = null
if (config.generate.props) {
propResults = await withSpinner('Extracting properties', () =>
extractProps(config, null, stockSrc, null))
delete propResults.missingProps
delete propResults.fingerprint
}
// 3. Props
let propResults: PropResults | null = null
if (config.generate.props) {
propResults = await withSpinner('Extracting properties', () =>
extractProps(config, null, stockSrc))
delete propResults.missingProps
delete propResults.fingerprint
}
// 4. Build files
await withSpinner('Generating build files', () =>
generateBuildFiles(config, dirs, entries, [], propResults, null, null, null,
stockSrc, false, true))
// 4. Build files
await withSpinner('Generating build files', () =>
generateBuildFiles(config, dirs, entries, [], propResults, null, null, null,
stockSrc, false, true))
})
}
}

8
src/frontend/generate.ts
View file

@ -34,13 +34,13 @@ export async function enumerateFiles(
filters: Filters,
forceIncludeFilters: Filters | null,
namedEntries: Map<string, BlobEntry>,
customState: SystemState,
customState: SystemState | null,
stockSrc: string,
) {
for (let partition of ALL_SYS_PARTITIONS) {
let filesRef = await listPart(partition, stockSrc, filters)
if (filesRef == null) continue
let filesNew = customState.partitionFiles[partition]
let filesNew = customState?.partitionFiles[partition] ?? []
if (filesNew == undefined) continue
let missingFiles = diffLists(filesNew, filesRef)
@ -117,11 +117,11 @@ export async function flattenApexs(
export async function extractProps(
config: DeviceConfig,
customState: SystemState,
customState: SystemState | null,
stockSrc: string,
) {
let stockProps = await loadPartitionProps(stockSrc)
let customProps = customState.partitionProps
let customProps = customState?.partitionProps ?? new Map<string, Map<string, string>>()
// Filters
for (let props of stockProps.values()) {