StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vndk snapshot suffix on Makefile

Browse Source 
When exporting Soong modules to Makefile, each VNDK snapshot module
whose version is BOARD_VNDK_VERSION has ".vendor" suffix. So makeLibName
should also return ".vendor", not the full vndk snapshot suffix like
".vndk.29.arm64.vendor".

Exempt-From-Owner-Approval: cherry-pick

Bug: 151274994
Test: manual build with snapshot
Change-Id: I48f606f90f6c5ca55d0a5bc29bad491c38a44f47
Merged-In: I48f606f90f6c5ca55d0a5bc29bad491c38a44f47
(cherry picked from commit 7ac1fa7823)
This commit is contained in:
Inseob Kim
2020-03-14 01:30:34 +09:00
parent 0528180f4b
commit 752edec290
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/cc.go
View File

@@ -2433,8 +2433,13 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if c, ok := ccDep.(*Module); ok { if c, ok := ccDep.(*Module); ok {
// Use base module name for snapshots when exporting to Makefile. // Use base module name for snapshots when exporting to Makefile.
if c.isSnapshotPrebuilt() && !c.IsVndk() { if c.isSnapshotPrebuilt() {
baseName := c.BaseModuleName() baseName := c.BaseModuleName()
if c.IsVndk() {
return baseName + ".vendor"
}
if vendorSuffixModules[baseName] { if vendorSuffixModules[baseName] {
return baseName + ".vendor" return baseName + ".vendor"
} else { } else {