Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84e644ad authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Dedup use of "prebuilt_""

parents eb0454b2 9804da05

cc/prebuilt.go

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ package cc 


import (

	"path/filepath"

	"strings"



	"android/soong/android"

)
@@ -232,7 +231,7 @@ func (p *prebuiltLibraryLinker) disablePrebuilt() { 


// Implements versionedInterface

func (p *prebuiltLibraryLinker) implementationModuleName(name string) string {

	return strings.TrimPrefix(name, "prebuilt_")

	return android.RemoveOptionalPrebuiltPrefix(name)

}



func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {

java/java.go

+0 −3
Original line number Diff line number Diff line
@@ -1540,9 +1540,6 @@ var _ android.IDEInfo = (*Import)(nil) 
var _ android.IDECustomizedModuleName = (*Import)(nil)



// Collect information for opening IDE project files in java/jdeps.go.

const (

	removedPrefix = "prebuilt_"

)



func (j *Import) IDEInfo(dpInfo *android.IdeInfo) {

	dpInfo.Jars = append(dpInfo.Jars, j.PrebuiltSrcs()...)