diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/java/java.go b/java/java.go index c1ce880d6..383fc3ff8 100644 --- a/java/java.go +++ b/java/java.go @@ -1194,7 +1194,7 @@ func buildComplianceMetadata(ctx android.ModuleContext) { for _, paths := range ctx.GetOutputFiles().TaggedOutputFiles { builtFiles = append(builtFiles, paths.Strings()...) } - complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.BUILT_FILES, android.FirstUniqueStrings(builtFiles)) + complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.BUILT_FILES, android.SortedUniqueStrings(builtFiles)) // Static deps staticDepNames := make([]string, 0) @@ -1207,8 +1207,8 @@ func buildComplianceMetadata(ctx android.ModuleContext) { staticDepFiles = append(staticDepFiles, dep.ResourceJars...) } }) - complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEPS, android.FirstUniqueStrings(staticDepNames)) - complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEP_FILES, android.FirstUniqueStrings(staticDepFiles.Strings())) + complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEPS, android.SortedUniqueStrings(staticDepNames)) + complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEP_FILES, android.SortedUniqueStrings(staticDepFiles.Strings())) } func (j *Library) getJarInstallDir(ctx android.ModuleContext) android.InstallPath { @@ -1282,13 +1282,6 @@ func (j *Library) createApiXmlFile(ctx android.ModuleContext) { Input: j.implementationAndResourcesJar, Output: j.apiXmlFile, }) - } -} - -var _ android.ModuleMakeVarsProvider = (*Library)(nil) - -func (j *Library) MakeVars(ctx android.MakeVarsModuleContext) { - if j.apiXmlFile != nil { ctx.DistForGoal("dist_files", j.apiXmlFile) } } @@ -3546,7 +3539,6 @@ func DexImportFactory() android.Module { type Defaults struct { android.ModuleBase android.DefaultsModuleBase - android.ApexModuleBase } // java_defaults provides a set of properties that can be inherited by other java or android modules. |