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

Commit 5cfc70d1 authored by Colin Cross's avatar Colin Cross
Browse files

Remove use of deprecated ExtractSourcesDeps 

Tag DexImportProperties.Jars with `android:"path"` and remove the
call to ExtractSourcesDeps.

Test: m checkbuild
Change-Id: Ia106d48ecf7e3fc98637a757a9812edcf65f5b82
parent 527f3e55

java/java.go

+1 −5
Original line number Diff line number Diff line
@@ -2042,7 +2042,7 @@ func ImportFactoryHost() android.Module { 
// dex_import module



type DexImportProperties struct {

	Jars []string

	Jars []string `android:"path"`

}



type DexImport struct {
@@ -2070,10 +2070,6 @@ func (j *DexImport) Name() string { 
	return j.prebuilt.Name(j.ModuleBase.Name())

}



func (j *DexImport) DepsMutator(ctx android.BottomUpMutatorContext) {

	android.ExtractSourcesDeps(ctx, j.properties.Jars)

}



func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	if len(j.properties.Jars) != 1 {

		ctx.PropertyErrorf("jars", "exactly one jar must be provided")