diff --git a/src/blobs/apex.ts b/src/blobs/apex.ts index 76a3562..7f0de84 100644 --- a/src/blobs/apex.ts +++ b/src/blobs/apex.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' -import * as path from 'path' -import * as unzipit from 'unzipit' +import path from 'path' +import unzipit from 'unzipit' import { enumerateSelinuxLabels, SelinuxFileLabels } from '../selinux/labels' import { ProgressCallback } from '../util/cli' diff --git a/src/blobs/build.ts b/src/blobs/build.ts index 6edf98c..478c927 100644 --- a/src/blobs/build.ts +++ b/src/blobs/build.ts @@ -1,4 +1,4 @@ -import * as path from 'path' +import path from 'path' import { promises as fs } from 'fs' import { blobToFileCopy, BoardMakefile, ModulesMakefile, DeviceMakefile, sanitizeBasename, serializeBoardMakefile, serializeModulesMakefile, serializeDeviceMakefile, Symlink, ProductsMakefile, ProductMakefile, serializeProductMakefile, serializeProductsMakefile } from '../build/make' diff --git a/src/blobs/copy.ts b/src/blobs/copy.ts index 245b84a..08d75cb 100644 --- a/src/blobs/copy.ts +++ b/src/blobs/copy.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs' -import * as path from 'path' +import path from 'path' import { BlobEntry } from './entry' import { startActionSpinner, stopActionSpinner } from '../util/cli' diff --git a/src/blobs/file_list.ts b/src/blobs/file_list.ts index 4cd4e3a..3c390b4 100644 --- a/src/blobs/file_list.ts +++ b/src/blobs/file_list.ts @@ -1,4 +1,4 @@ -import * as path from 'path' +import path from 'path' import { BlobEntry, partPathToSrcPath, srcPathToPartPath } from './entry' import { exists, listFilesRecursive } from '../util/fs' diff --git a/src/blobs/overlays.ts b/src/blobs/overlays.ts index 622aaf9..45c55d0 100644 --- a/src/blobs/overlays.ts +++ b/src/blobs/overlays.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' -import * as path from 'path' -import * as xml2js from 'xml2js' +import path from 'path' +import xml2js from 'xml2js' import { serializeBlueprint } from '../build/soong' import { aapt2 } from '../util/process' diff --git a/src/blobs/presigned.ts b/src/blobs/presigned.ts index 2b73aca..e61a1f0 100644 --- a/src/blobs/presigned.ts +++ b/src/blobs/presigned.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs' -import * as path from 'path' +import path from 'path' import { parseSeappContexts } from '../selinux/seapp' import { aapt2 } from '../util/process' diff --git a/src/blobs/vintf.ts b/src/blobs/vintf.ts index f53dc6e..bfff571 100644 --- a/src/blobs/vintf.ts +++ b/src/blobs/vintf.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs' -import * as xml2js from 'xml2js' +import xml2js from 'xml2js' import { exists } from '../util/fs' import { EXT_PARTITIONS } from '../util/partitions' diff --git a/src/build/soong.ts b/src/build/soong.ts index 42a3eaa..b08dee9 100644 --- a/src/build/soong.ts +++ b/src/build/soong.ts @@ -1,4 +1,4 @@ -import * as util from 'util' +import util from 'util' import { BlobEntry, partPathToSrcPath } from '../blobs/entry' import { SOONG_HEADER } from '../util/headers' diff --git a/src/commands/generate-all.ts b/src/commands/generate-all.ts index c82ee02..9c79504 100644 --- a/src/commands/generate-all.ts +++ b/src/commands/generate-all.ts @@ -1,6 +1,6 @@ import { Command, flags } from '@oclif/command' import { promises as fs } from 'fs' -import * as path from 'path' +import path from 'path' import { flattenAllApexs } from '../blobs/apex' import { createVendorDirs, generateBuild, writeBuildFiles } from '../blobs/build' diff --git a/src/config/device.ts b/src/config/device.ts index 310697d..74f1982 100644 --- a/src/config/device.ts +++ b/src/config/device.ts @@ -1,4 +1,4 @@ -import * as YAML from 'yaml' +import YAML from 'yaml' import { PropFilters } from '../blobs/props' export interface DeviceInfo { diff --git a/src/images/download.ts b/src/images/download.ts index 256b6a7..67ea9b5 100644 --- a/src/images/download.ts +++ b/src/images/download.ts @@ -1,8 +1,8 @@ import { createWriteStream } from 'fs' -import * as cliProgress from 'cli-progress' +import cliProgress from 'cli-progress' import fetch from 'node-fetch' import { promises as stream } from 'stream' -import * as path from 'path' +import path from 'path' const VENDOR_INDEX_URL = 'https://developers.google.com/android/drivers' const VENDOR_URL_PREFIX = 'https://dl.google.com/dl/android/aosp/google_devices' diff --git a/src/images/firmware.ts b/src/images/firmware.ts index c26dc6a..2e0142f 100644 --- a/src/images/firmware.ts +++ b/src/images/firmware.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs' -import * as unzipit from 'unzipit' +import unzipit from 'unzipit' import { NodeFileReader } from '../util/zip' diff --git a/src/selinux/contexts.ts b/src/selinux/contexts.ts index a37b07d..61c1eea 100644 --- a/src/selinux/contexts.ts +++ b/src/selinux/contexts.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs' -import * as path from 'path' +import path from 'path' import { exists, listFilesRecursive } from '../util/fs' import { parseLines } from '../util/parse' diff --git a/src/selinux/keys.ts b/src/selinux/keys.ts index df244db..1a64f16 100644 --- a/src/selinux/keys.ts +++ b/src/selinux/keys.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' -import * as path from 'path' -import * as xml2js from 'xml2js' +import path from 'path' +import xml2js from 'xml2js' import { exists, listFilesRecursive } from '../util/fs' import { parseLines } from '../util/parse' diff --git a/src/util/fs.ts b/src/util/fs.ts index 064f6a1..5be7b99 100644 --- a/src/util/fs.ts +++ b/src/util/fs.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' -import * as os from 'os' -import * as path from 'path' +import os from 'os' +import path from 'path' import { run } from './process' diff --git a/src/util/process.ts b/src/util/process.ts index 24211d0..1c70199 100644 --- a/src/util/process.ts +++ b/src/util/process.ts @@ -1,4 +1,4 @@ -import * as util from 'util' +import util from 'util' import { exec as execCb } from 'child_process' const exec = util.promisify(execCb)