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

Merge "Dedup use of "prebuilt_"" am: 84e644ada0 am: 6df1c9c190

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870489

Change-Id: I8ef8766f0eb252de7f1cc398719190f3617bf76e
This commit is contained in:
Paul Duffin
2021-10-26 15:58:27 +00:00
committed by Automerger Merge Worker
parent f66d5035fd 6df1c9c190
commit 28537eb8db
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/prebuilt.go
View File

@@ -16,7 +16,6 @@ package cc
import ( import (
"path/filepath" "path/filepath"
"strings"
"android/soong/android" "android/soong/android"
) )
@@ -232,7 +231,7 @@ func (p *prebuiltLibraryLinker) disablePrebuilt() {
// Implements versionedInterface // Implements versionedInterface
func (p *prebuiltLibraryLinker) implementationModuleName(name string) string { func (p *prebuiltLibraryLinker) implementationModuleName(name string) string {
return strings.TrimPrefix(name, "prebuilt_") return android.RemoveOptionalPrebuiltPrefix(name)
} }
func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) { func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {

3
java/java.go
View File

@@ -1540,9 +1540,6 @@ var _ android.IDEInfo = (*Import)(nil)
var _ android.IDECustomizedModuleName = (*Import)(nil) var _ android.IDECustomizedModuleName = (*Import)(nil)
// Collect information for opening IDE project files in java/jdeps.go. // Collect information for opening IDE project files in java/jdeps.go.
const (
removedPrefix = "prebuilt_"
)
func (j *Import) IDEInfo(dpInfo *android.IdeInfo) { func (j *Import) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Jars = append(dpInfo.Jars, j.PrebuiltSrcs()...) dpInfo.Jars = append(dpInfo.Jars, j.PrebuiltSrcs()...)