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

Merge changes I89ad92f3,Ife1604c0

Browse Source 
* changes:
  Don't add dependencies on uses-library modules in unbundled builds
  Add implicit outputs to ErrorRule rules
This commit is contained in:
Colin Cross
2019-06-13 03:36:08 +00:00
committed by Gerrit Code Review
parent 72ea641dff 3245b2cb83
commit e51e2feafd
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/module.go
View File

@@ -966,10 +966,12 @@ type moduleContext struct {
func (m *moduleContext) ninjaError(params BuildParams, err error) (PackageContext, BuildParams) { func (m *moduleContext) ninjaError(params BuildParams, err error) (PackageContext, BuildParams) {
return pctx, BuildParams{ return pctx, BuildParams{
Rule: ErrorRule, Rule: ErrorRule,
Description: params.Description, Description: params.Description,
Output: params.Output, Output: params.Output,
Outputs: params.Outputs, Outputs: params.Outputs,
ImplicitOutput: params.ImplicitOutput,
ImplicitOutputs: params.ImplicitOutputs,
Args: map[string]string{ Args: map[string]string{
"error": err.Error(), "error": err.Error(),
}, },

22
java/app.go
View File

@@ -938,16 +938,18 @@ type usesLibrary struct {
} }
func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs bool) { func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs bool) {
ctx.AddVariationDependencies(nil, usesLibTag, u.usesLibraryProperties.Uses_libs...) if !ctx.Config().UnbundledBuild() {
ctx.AddVariationDependencies(nil, usesLibTag, u.presentOptionalUsesLibs(ctx)...) ctx.AddVariationDependencies(nil, usesLibTag, u.usesLibraryProperties.Uses_libs...)
if !noFrameworkLibs { ctx.AddVariationDependencies(nil, usesLibTag, u.presentOptionalUsesLibs(ctx)...)
// dexpreopt/dexpreopt.go needs the paths to the dex jars of these libraries in case construct_context.sh needs if !noFrameworkLibs {
// to pass them to dex2oat. Add them as a dependency so we can determine the path to the dex jar of each // dexpreopt/dexpreopt.go needs the paths to the dex jars of these libraries in case construct_context.sh needs
// library to dexpreopt. // to pass them to dex2oat. Add them as a dependency so we can determine the path to the dex jar of each
ctx.AddVariationDependencies(nil, usesLibTag, // library to dexpreopt.
"org.apache.http.legacy", ctx.AddVariationDependencies(nil, usesLibTag,
"android.hidl.base-V1.0-java", "org.apache.http.legacy",
"android.hidl.manager-V1.0-java") "android.hidl.base-V1.0-java",
"android.hidl.manager-V1.0-java")
}
} }
} }