From b5ddfa9219585b9f60bbf3aa3526b9c216b6d9e0 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Aug 2019 19:12:42 +0900 Subject: Remove srcs_lib and srcs_lib_whitelist_pkgs They are no longer used. Sources are provided via filegroup. Also removing the SrcDependency interface as it is no longer used. Bug: 135922046 Test: m Merged-In: I81f9614d20fbdd2f7d18340d6dbdb592e7acde06 (cherry picked from commit fa21cba64a3a14164642a7067c071f861b7ac96e) Change-Id: I81f9614d20fbdd2f7d18340d6dbdb592e7acde06 --- java/java.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 494a4e7c0..4ae40bf0b 100644 --- a/java/java.go +++ b/java/java.go @@ -404,29 +404,14 @@ type SdkLibraryDependency interface { SdkImplementationJars(ctx android.BaseModuleContext, sdkVersion string) android.Paths } -type SrcDependency interface { - CompiledSrcs() android.Paths - CompiledSrcJars() android.Paths -} - type xref interface { XrefJavaFiles() android.Paths } -func (j *Module) CompiledSrcs() android.Paths { - return j.compiledJavaSrcs -} - -func (j *Module) CompiledSrcJars() android.Paths { - return j.compiledSrcJars -} - func (j *Module) XrefJavaFiles() android.Paths { return j.kytheFiles } -var _ SrcDependency = (*Module)(nil) - func InitJavaModule(module android.DefaultableModule, hod android.HostOrDeviceSupported) { android.InitAndroidArchModule(module, hod, android.MultilibCommon) android.InitDefaultableModule(module) @@ -1033,8 +1018,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { srcJars = append(srcJars, aaptSrcJar) } - // Collect source files from compiledJavaSrcs, compiledSrcJars and filter out Exclude_srcs - // that IDEInfo struct will use + // Collect source files and filter out Exclude_srcs that IDEInfo struct will use j.expandIDEInfoCompiledSrcs = append(j.expandIDEInfoCompiledSrcs, srcFiles.Strings()...) if j.properties.Jarjar_rules != nil { -- cgit v1.2.3-59-g8ed1b