openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use correct variant for annotation processors. 

Annotation processors should always have a common host variant, rather
than a device variant as the build was looking for before.

Bug: 110868826
Test: m
Change-Id: I2b7d0e7ed1af3f2f9ddb87d2bf36920737a507e9
This commit is contained in:
Mathew Inwood 2018-07-02 16:34:51 +01:00
parent b1f0f1aecd
commit 878c662602
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/config.go
View File

@ -90,8 +90,9 @@ type config struct {
ConfigFileName string ConfigFileName string
ProductVariablesFileName string ProductVariablesFileName string
Targets map[OsClass][]Target Targets map[OsClass][]Target
BuildOsVariant string BuildOsVariant string
BuildOsCommonVariant string
deviceConfig *deviceConfig deviceConfig *deviceConfig
@ -310,6 +311,7 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
config.Targets = targets config.Targets = targets
config.BuildOsVariant = targets[Host][0].String() config.BuildOsVariant = targets[Host][0].String()
config.BuildOsCommonVariant = getCommonTargets(targets[Host])[0].String()
if err := config.fromEnv(); err != nil { if err := config.fromEnv(); err != nil {
return Config{}, err return Config{}, err

5
java/java.go
View File

@ -522,8 +522,9 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...) ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...)
ctx.AddDependency(ctx.Module(), staticLibTag, j.properties.Static_libs...) ctx.AddDependency(ctx.Module(), staticLibTag, j.properties.Static_libs...)
ctx.AddDependency(ctx.Module(), annoTag, j.properties.Annotation_processors...) ctx.AddFarVariationDependencies([]blueprint.Variation{
{"arch", ctx.Config().BuildOsCommonVariant},
}, annoTag, j.properties.Annotation_processors...)
android.ExtractSourcesDeps(ctx, j.properties.Srcs) android.ExtractSourcesDeps(ctx, j.properties.Srcs)
android.ExtractSourcesDeps(ctx, j.properties.Exclude_srcs) android.ExtractSourcesDeps(ctx, j.properties.Exclude_srcs)
android.ExtractSourcesDeps(ctx, j.properties.Java_resources) android.ExtractSourcesDeps(ctx, j.properties.Java_resources)