diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/java/java.go b/java/java.go index dd2437621..b3abc9118 100644 --- a/java/java.go +++ b/java/java.go @@ -294,6 +294,11 @@ type UsesLibraryDependency interface { ClassLoaderContexts() dexpreopt.ClassLoaderContextMap } +// Provides transitive Proguard flag files to downstream DEX jars. +type LibraryDependency interface { + ExportedProguardFlagFiles() android.Paths +} + // TODO(jungjw): Move this to kythe.go once it's created. type xref interface { XrefJavaFiles() android.Paths @@ -596,9 +601,17 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav type Library struct { Module + exportedProguardFlagFiles android.Paths + InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths) } +var _ LibraryDependency = (*Library)(nil) + +func (j *Library) ExportedProguardFlagFiles() android.Paths { + return j.exportedProguardFlagFiles +} + var _ android.ApexModule = (*Library)(nil) // Provides access to the list of permitted packages from apex boot jars. @@ -694,6 +707,15 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.installFile = ctx.InstallFile(installDir, j.Stem()+".jar", j.outputFile, extraInstallDeps...) } + + j.exportedProguardFlagFiles = append(j.exportedProguardFlagFiles, + android.PathsForModuleSrc(ctx, j.dexProperties.Optimize.Proguard_flags_files)...) + ctx.VisitDirectDeps(func(m android.Module) { + if lib, ok := m.(LibraryDependency); ok && ctx.OtherModuleDependencyTag(m) == staticLibTag { + j.exportedProguardFlagFiles = append(j.exportedProguardFlagFiles, lib.ExportedProguardFlagFiles()...) + } + }) + j.exportedProguardFlagFiles = android.FirstUniquePaths(j.exportedProguardFlagFiles) } func (j *Library) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -888,10 +910,6 @@ type TestOptions struct { // a list of extra test configuration files that should be installed with the module. Extra_test_configs []string `android:"path,arch_variant"` - - // Extra <option> tags to add to the auto generated test xml file. The "key" - // is optional in each of these. - Tradefed_options []tradefed.Option } type testProperties struct { @@ -1170,18 +1188,8 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest) } - j.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). - SetTestConfigProp(j.testProperties.Test_config). - SetTestTemplateConfigProp(j.testProperties.Test_config_template). - SetTestSuites(j.testProperties.Test_suites). - SetConfig(configs). - SetOptionsForAutogenerated(j.testProperties.Test_options.Tradefed_options). - SetAutoGenConfig(j.testProperties.Auto_gen_config). - SetUnitTest(j.testProperties.Test_options.Unit_test). - SetDeviceTemplate("${JavaTestConfigTemplate}"). - SetHostTemplate("${JavaHostTestConfigTemplate}"). - SetHostUnitTestTemplate("${JavaHostUnitTestConfigTemplate}"). - Build() + j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template, + j.testProperties.Test_suites, configs, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test) j.data = android.PathsForModuleSrc(ctx, j.testProperties.Data) @@ -1226,13 +1234,8 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex } func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { - j.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). - SetTestConfigProp(j.prebuiltTestProperties.Test_config). - SetTestSuites(j.prebuiltTestProperties.Test_suites). - SetDeviceTemplate("${JavaTestConfigTemplate}"). - SetHostTemplate("${JavaHostTestConfigTemplate}"). - SetHostUnitTestTemplate("${JavaHostUnitTestConfigTemplate}"). - Build() + j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.prebuiltTestProperties.Test_config, nil, + j.prebuiltTestProperties.Test_suites, nil, nil, nil) j.Import.GenerateAndroidBuildActions(ctx) } |