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

extract: Fix DSP library names

Browse source
This commit is contained in:
Danny Lin 2021-11-07 06:59:55 -08:00
parent 248f1ec96d
commit a10f86cd98
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/build/soong.ts
View file

@ -3,7 +3,6 @@ import * as util from 'util'
import { BlobEntry, partPathToSrcPath } from '../blobs/entry' import { BlobEntry, partPathToSrcPath } from '../blobs/entry'
export const SPECIAL_FILE_EXTENSIONS = new Set([ export const SPECIAL_FILE_EXTENSIONS = new Set([
'.sh',
'.so', '.so',
'.apk', '.apk',
'.jar', '.jar',

3
src/commands/extract.ts
View file

@ -33,12 +33,13 @@ async function generateBuild(
let conflictCounters = new Map<string, number>() let conflictCounters = new Map<string, number>()
for (let entry of entries) { for (let entry of entries) {
let ext = path.extname(entry.path) let ext = path.extname(entry.path)
let pathParts = entry.path.split('/')
if (blobNeedsSoong(entry, ext)) { if (blobNeedsSoong(entry, ext)) {
// Named dependencies -> Soong blueprint // Named dependencies -> Soong blueprint
// Module name = file name, excluding extension if it was used // Module name = file name, excluding extension if it was used
let baseExt = SPECIAL_FILE_EXTENSIONS.has(ext) ? ext : undefined let baseExt = (SPECIAL_FILE_EXTENSIONS.has(ext) && pathParts[0] != 'dsp') ? ext : undefined
let name = path.basename(entry.path, baseExt) let name = path.basename(entry.path, baseExt)
// If already exists: skip if it's the other arch variant of a library in // If already exists: skip if it's the other arch variant of a library in