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

generate: Accept flexible source paths

Browse source
This commit is contained in:
Danny Lin 2021-12-16 19:07:31 -08:00
parent 7a63260914
commit 54cce1b8f6
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/commands/generate-all.ts
View file

@ -7,6 +7,7 @@ import { BlobEntry } from '../blobs/entry'
import { loadDeviceConfig } from '../config/device'
import { collectSystemState, parseSystemState, SystemState } from '../config/system-state'
import { enumerateFiles, extractFirmware, extractOverlays, extractProps, extractVintfManifests, flattenApexs, generateBuildFiles, PropResults, resolveOverrides, resolveSepolicyDirs, updatePresigned } from '../frontend/generate'
import { wrapSystemSrc } from '../frontend/source'
import { SelinuxPartResolutions } from '../selinux/contexts'
import { withSpinner } from '../util/cli'
import { readFile, withTempDir } from '../util/fs'
@ -17,6 +18,7 @@ export default class GenerateFull extends Command {
static flags = {
help: flags.help({char: 'h'}),
aapt2: flags.string({char: 'a', description: 'path to aapt2 executable', default: 'out/host/linux-x86/bin/aapt2'}),
buildId: flags.string({char: 'b', description: 'build ID of the stock images'}),
stockSrc: flags.string({char: 's', description: 'path to root of mounted stock system images (./system_ext, ./product, etc.)', required: true}),
customSrc: flags.string({char: 'c', description: 'path to AOSP build output directory (out/) or JSON state file', default: 'out'}),
factoryZip: flags.string({char: 'f', description: 'path to stock factory images zip (for extracting firmware)'}),
@ -28,7 +30,7 @@ export default class GenerateFull extends Command {
]
async run() {
let {flags: {aapt2: aapt2Path, stockSrc, customSrc, factoryZip, skipCopy}, args: {config: configPath}} = this.parse(GenerateFull)
let {flags: {aapt2: aapt2Path, buildId, stockSrc, customSrc, factoryZip, skipCopy}, args: {config: configPath}} = this.parse(GenerateFull)
let config = await loadDeviceConfig(configPath)
@ -42,6 +44,11 @@ export default class GenerateFull extends Command {
// tmp may be needed for mounting/extracting stock images and/or APEX flattening
await withTempDir(async (tmp) => {
// Prepare stock system source
let wrapBuildId = buildId == undefined ? null : buildId
stockSrc = await withSpinner('Extracting stock system source', (spinner) =>
wrapSystemSrc(stockSrc, config.device.name, wrapBuildId, tmp, spinner))
// Each step will modify this. Key = combined part path
let namedEntries = new Map<string, BlobEntry>()

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

@ -5,6 +5,7 @@ import { copyBlobs } from '../blobs/copy'
import { BlobEntry } from '../blobs/entry'
import { loadDeviceConfig } from '../config/device'
import { enumerateFiles, extractProps, generateBuildFiles, PropResults } from '../frontend/generate'
import { wrapSystemSrc } from '../frontend/source'
import { withSpinner } from '../util/cli'
import { withTempDir } from '../util/fs'
@ -13,6 +14,7 @@ export default class GeneratePrep extends Command {
static flags = {
help: flags.help({char: 'h'}),
buildId: flags.string({char: 'b', description: 'build ID of the stock images'}),
stockSrc: flags.string({char: 's', description: 'path to root of mounted stock system images (./system_ext, ./product, etc.)', required: true}),
skipCopy: flags.boolean({char: 'k', description: 'skip file copying and only generate build files'}),
}
@ -22,12 +24,17 @@ export default class GeneratePrep extends Command {
]
async run() {
let {flags: {stockSrc, skipCopy}, args: {config: configPath}} = this.parse(GeneratePrep)
let {flags: {buildId, stockSrc, skipCopy}, args: {config: configPath}} = this.parse(GeneratePrep)
let config = await loadDeviceConfig(configPath)
// tmp may be needed for mounting/extracting stock images
await withTempDir(async (tmp) => {
// Prepare stock system source
let wrapBuildId = buildId == undefined ? null : buildId
stockSrc = await withSpinner('Extracting stock system source', (spinner) =>
wrapSystemSrc(stockSrc, config.device.name, wrapBuildId, tmp, spinner))
// Each step will modify this. Key = combined part path
let namedEntries = new Map<string, BlobEntry>()