diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 10 | ||||
| -rw-r--r-- | java/platform_compat_config.go | 6 | ||||
| -rw-r--r-- | java/sdk_library.go | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 08fb6782c..6fee7ce9a 100644 --- a/java/java.go +++ b/java/java.go @@ -1501,7 +1501,7 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { InstalledFiles: j.data, OutputFile: j.outputFile, TestConfig: j.testConfig, - RequiredModuleNames: j.RequiredModuleNames(), + RequiredModuleNames: j.RequiredModuleNames(ctx), TestSuites: j.testProperties.Test_suites, IsHost: true, LocalSdkVersion: j.sdkVersion.String(), @@ -2285,10 +2285,10 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { al.stubsFlags(ctx, cmd, stubsDir) - migratingNullability := String(al.properties.Previous_api) != "" - if migratingNullability { - previousApi := android.PathForModuleSrc(ctx, String(al.properties.Previous_api)) - cmd.FlagWithInput("--migrate-nullness ", previousApi) + previousApi := String(al.properties.Previous_api) + if previousApi != "" { + previousApiFiles := android.PathsForModuleSrc(ctx, []string{previousApi}) + cmd.FlagForEachInput("--migrate-nullness ", previousApiFiles) } al.addValidation(ctx, cmd, al.validationPaths) diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go index 49756dd99..45b994498 100644 --- a/java/platform_compat_config.go +++ b/java/platform_compat_config.go @@ -61,6 +61,8 @@ type platformCompatConfig struct { installDirPath android.InstallPath configFile android.OutputPath metadataFile android.OutputPath + + installConfigFile android.InstallPath } func (p *platformCompatConfig) compatConfigMetadata() android.Path { @@ -106,8 +108,12 @@ func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleCon FlagWithOutput("--merged-config ", p.metadataFile) p.installDirPath = android.PathForModuleInstall(ctx, "etc", "compatconfig") + p.installConfigFile = android.PathForModuleInstall(ctx, "etc", "compatconfig", p.configFile.Base()) rule.Build(configFileName, "Extract compat/compat_config.xml and install it") +} +func (p *platformCompatConfig) FilesToInstall() android.InstallPaths { + return android.InstallPaths{p.installConfigFile} } func (p *platformCompatConfig) AndroidMkEntries() []android.AndroidMkEntries { diff --git a/java/sdk_library.go b/java/sdk_library.go index e9fa83ae7..c19b07bb6 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -3279,7 +3279,7 @@ func (module *sdkLibraryXml) implPath(ctx android.ModuleContext) string { // TODO(b/146468504): ApexVariationName() is only a soong module name, not apex name. // In most cases, this works fine. But when apex_name is set or override_apex is used // this can be wrong. - return fmt.Sprintf("/apex/%s/javalib/%s.jar", apexInfo.ApexVariationName, implName) + return fmt.Sprintf("/apex/%s/javalib/%s.jar", apexInfo.BaseApexName, implName) } partition := "system" if module.SocSpecific() { |