diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 20 | ||||
| -rw-r--r-- | java/device_host_converter.go | 16 | ||||
| -rw-r--r-- | java/java.go | 41 | ||||
| -rw-r--r-- | java/rro_test.go | 9 |
4 files changed, 5 insertions, 81 deletions
diff --git a/java/aar.go b/java/aar.go index 602d2c49c..554ea670b 100644 --- a/java/aar.go +++ b/java/aar.go @@ -805,14 +805,6 @@ func (a *AARImport) HeaderJars() android.Paths { return android.Paths{a.classpathFile} } -func (a *AARImport) ImplementationJars() android.Paths { - return android.Paths{a.classpathFile} -} - -func (a *AARImport) ResourceJars() android.Paths { - return nil -} - func (a *AARImport) ImplementationAndResourcesJars() android.Paths { return android.Paths{a.classpathFile} } @@ -825,22 +817,10 @@ func (a *AARImport) DexJarInstallPath() android.Path { return nil } -func (a *AARImport) AidlIncludeDirs() android.Paths { - return nil -} - func (a *AARImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { return nil } -func (d *AARImport) ExportedPlugins() (android.Paths, []string, bool) { - return nil, nil, false -} - -func (a *AARImport) SrcJarArgs() ([]string, android.Paths) { - return nil, nil -} - var _ android.ApexModule = (*AARImport)(nil) // Implements android.ApexModule diff --git a/java/device_host_converter.go b/java/device_host_converter.go index ee7d01820..39fb04a8e 100644 --- a/java/device_host_converter.go +++ b/java/device_host_converter.go @@ -146,14 +146,6 @@ func (d *DeviceHostConverter) HeaderJars() android.Paths { return d.headerJars } -func (d *DeviceHostConverter) ImplementationJars() android.Paths { - return d.implementationJars -} - -func (d *DeviceHostConverter) ResourceJars() android.Paths { - return d.resourceJars -} - func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths { return d.implementationAndResourceJars } @@ -174,14 +166,6 @@ func (d *DeviceHostConverter) ClassLoaderContexts() dexpreopt.ClassLoaderContext return nil } -func (d *DeviceHostConverter) ExportedPlugins() (android.Paths, []string, bool) { - return nil, nil, false -} - -func (d *DeviceHostConverter) SrcJarArgs() ([]string, android.Paths) { - return d.srcJarArgs, d.srcJarDeps -} - func (d *DeviceHostConverter) JacocoReportClassesFile() android.Path { return nil } diff --git a/java/java.go b/java/java.go index e471f0de6..a025b1d03 100644 --- a/java/java.go +++ b/java/java.go @@ -2046,13 +2046,6 @@ func (j *Module) DexJarInstallPath() android.Path { return j.installFile } -func (j *Module) ResourceJars() android.Paths { - if j.resourceJar == nil { - return nil - } - return android.Paths{j.resourceJar} -} - func (j *Module) ImplementationAndResourcesJars() android.Paths { if j.implementationAndResourcesJar == nil { return nil @@ -2069,17 +2062,6 @@ func (j *Module) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { return j.classLoaderContexts } -// ExportedPlugins returns the list of jars needed to run the exported plugins, the list of -// classes for the plugins, and a boolean for whether turbine needs to be disabled due to plugins -// that generate APIs. -func (j *Module) ExportedPlugins() (android.Paths, []string, bool) { - return j.exportedPluginJars, j.exportedPluginClasses, j.exportedDisableTurbine -} - -func (j *Module) SrcJarArgs() ([]string, android.Paths) { - return j.srcJarArgs, j.srcJarDeps -} - var _ logtagsProducer = (*Module)(nil) func (j *Module) logtags() android.Paths { @@ -3046,17 +3028,6 @@ func (j *Import) HeaderJars() android.Paths { return android.Paths{j.combinedClasspathFile} } -func (j *Import) ImplementationJars() android.Paths { - if j.combinedClasspathFile == nil { - return nil - } - return android.Paths{j.combinedClasspathFile} -} - -func (j *Import) ResourceJars() android.Paths { - return nil -} - func (j *Import) ImplementationAndResourcesJars() android.Paths { if j.combinedClasspathFile == nil { return nil @@ -3072,22 +3043,10 @@ func (j *Import) DexJarInstallPath() android.Path { return nil } -func (j *Import) AidlIncludeDirs() android.Paths { - return j.exportAidlIncludeDirs -} - func (j *Import) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { return j.classLoaderContexts } -func (j *Import) ExportedPlugins() (android.Paths, []string, bool) { - return nil, nil, false -} - -func (j *Import) SrcJarArgs() ([]string, android.Paths) { - return nil, nil -} - var _ android.ApexModule = (*Import)(nil) // Implements android.ApexModule diff --git a/java/rro_test.go b/java/rro_test.go index edbf1708b..061d9d348 100644 --- a/java/rro_test.go +++ b/java/rro_test.go @@ -20,6 +20,7 @@ import ( "testing" "android/soong/android" + "android/soong/shared" ) func TestRuntimeResourceOverlay(t *testing.T) { @@ -105,7 +106,7 @@ func TestRuntimeResourceOverlay(t *testing.T) { // Check device location. path = androidMkEntries.EntryMap["LOCAL_MODULE_PATH"] - expectedPath = []string{"/tmp/target/product/test_device/product/overlay"} + expectedPath = []string{shared.JoinPath(buildDir, "../target/product/test_device/product/overlay")} if !reflect.DeepEqual(path, expectedPath) { t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath) } @@ -114,7 +115,7 @@ func TestRuntimeResourceOverlay(t *testing.T) { m = ctx.ModuleForTests("foo_themed", "android_common") androidMkEntries = android.AndroidMkEntriesForTest(t, ctx, m.Module())[0] path = androidMkEntries.EntryMap["LOCAL_MODULE_PATH"] - expectedPath = []string{"/tmp/target/product/test_device/product/overlay/faza"} + expectedPath = []string{shared.JoinPath(buildDir, "../target/product/test_device/product/overlay/faza")} if !reflect.DeepEqual(path, expectedPath) { t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath) } @@ -160,7 +161,7 @@ func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) { // Check device location. path := android.AndroidMkEntriesForTest(t, ctx, m.Module())[0].EntryMap["LOCAL_MODULE_PATH"] - expectedPath := []string{"/tmp/target/product/test_device/product/overlay/default_theme"} + expectedPath := []string{shared.JoinPath(buildDir, "../target/product/test_device/product/overlay/default_theme")} if !reflect.DeepEqual(path, expectedPath) { t.Errorf("Unexpected LOCAL_MODULE_PATH value: %q, expected: %q", path, expectedPath) } @@ -179,7 +180,7 @@ func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) { // Check device location. path = android.AndroidMkEntriesForTest(t, ctx, m.Module())[0].EntryMap["LOCAL_MODULE_PATH"] - expectedPath = []string{"/tmp/target/product/test_device/system/overlay"} + expectedPath = []string{shared.JoinPath(buildDir, "../target/product/test_device/system/overlay")} if !reflect.DeepEqual(path, expectedPath) { t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath) } |