Remove unused jars/sdk_version properties from java_system_modules am: 301ba52886

am: f5675d6ac3

Change-Id: Id2efcf5df5385368ce6b9a3388ee97d9ae4a9162
This commit is contained in:
Paul Duffin
2019-06-17 06:46:11 -07:00
committed by android-build-merger

View File

@@ -107,12 +107,6 @@ type SystemModules struct {
type SystemModulesProperties struct { type SystemModulesProperties struct {
// List of java library modules that should be included in the system modules // List of java library modules that should be included in the system modules
Libs []string Libs []string
// List of prebuilt jars that should be included in the system modules
Jars []string
// Sdk version that should be included in the system modules
Sdk_version *string
} }
func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -123,8 +117,6 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte
jars = append(jars, dep.HeaderJars()...) jars = append(jars, dep.HeaderJars()...)
}) })
jars = append(jars, android.PathsForModuleSrc(ctx, system.properties.Jars)...)
system.outputFile = TransformJarsToSystemModules(ctx, "java.base", jars) system.outputFile = TransformJarsToSystemModules(ctx, "java.base", jars)
} }