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

Commit e51e2fea authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I89ad92f3,Ife1604c0 

* changes:
  Don't add dependencies on uses-library modules in unbundled builds
  Add implicit outputs to ErrorRule rules
parents 72ea641d 3245b2cb

android/module.go

+6 −4
Original line number Diff line number Diff line
@@ -970,6 +970,8 @@ func (m *moduleContext) ninjaError(params BuildParams, err error) (PackageContex 
		Description:     params.Description,

		Output:          params.Output,

		Outputs:         params.Outputs,

		ImplicitOutput:  params.ImplicitOutput,

		ImplicitOutputs: params.ImplicitOutputs,

		Args: map[string]string{

			"error": err.Error(),

		},

java/app.go

+12 −10
Original line number Diff line number Diff line
@@ -938,6 +938,7 @@ type usesLibrary struct { 
}



func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs bool) {

	if !ctx.Config().UnbundledBuild() {

		ctx.AddVariationDependencies(nil, usesLibTag, u.usesLibraryProperties.Uses_libs...)

		ctx.AddVariationDependencies(nil, usesLibTag, u.presentOptionalUsesLibs(ctx)...)

		if !noFrameworkLibs {
@@ -950,6 +951,7 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs b 
				"android.hidl.manager-V1.0-java")

		}

	}

}



// presentOptionalUsesLibs returns optional_uses_libs after filtering out MissingUsesLibraries, which don't exist in the

// build.