From 761a7b14df0744897832dff3396a8cfe3da7a8b5 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sun, 7 Nov 2021 07:04:59 -0800 Subject: [PATCH] soong: Fix conflicted shared library file names --- src/build/soong.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/build/soong.ts b/src/build/soong.ts index 8d79cbb..0d58e0a 100644 --- a/src/build/soong.ts +++ b/src/build/soong.ts @@ -1,3 +1,4 @@ +import * as path from 'path' import * as util from 'util' import { BlobEntry, partPathToSrcPath } from '../blobs/entry' @@ -15,6 +16,7 @@ export interface TargetSrcs { } export interface SharedLibraryModule { + stem: string relative_install_path?: string strip: { none: boolean @@ -185,6 +187,7 @@ export function blobToSoongModule( moduleSpecific = { _type: 'cc_prebuilt_library_shared', + stem: path.basename(entry.path, '.so'), ...(relPath && { relative_install_path: relPath }), strip: { none: true,