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

generate-full: Extract and re-label flattened APEXs

Browse source
This commit is contained in:
Danny Lin 2021-11-23 20:11:11 -08:00
parent 6a5a9a5388
commit 0f88711fcd
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import { parseDeviceConfig } from '../config/device'
import { parseSystemState, SystemState } from '../config/system-state'
import { ANDROID_INFO, extractFactoryFirmware, generateAndroidInfo, writeFirmwareImages } from '../images/firmware'
import { diffPartContexts, parseContextsRecursive, parsePartContexts, resolvePartContextDiffs, SelinuxContexts } from '../selinux/contexts'
import { generateFileContexts } from '../selinux/labels'
import { startActionSpinner, stopActionSpinner } from '../util/cli'
import { withTempDir } from '../util/fs'
import { ALL_PARTITIONS } from '../util/partitions'
@ -107,7 +108,14 @@ export default class GenerateFull extends Command {
// 4. Flatten APEX modules
if (config.flatten_apex) {
spinner = startActionSpinner('Flattening APEX modules')
entries = await flattenAllApexs(entries, stockRoot, tmp)
let apex = await flattenAllApexs(entries, stockRoot, tmp, (progress) => {
spinner.text = progress
})
entries = apex.entries
// Write context labels
let fileContexts = `${dirs.sepolicy}/file_contexts`
await fs.writeFile(fileContexts, generateFileContexts(apex.labels))
stopActionSpinner(spinner)
}
@ -156,6 +164,10 @@ export default class GenerateFull extends Command {
// Diff; reversed custom->stock order to get *missing* contexts
let ctxDiffs = diffPartContexts(customContexts, stockContexts)
let ctxResolutions = resolvePartContextDiffs(ctxDiffs, sourceContexts)
// Add APEX labels
if (ctxResolutions.has('vendor')) {
ctxResolutions.get('vendor')!.sepolicyDirs.push(dirs.sepolicy)
}
stopActionSpinner(spinner)
// 8. Overlays