diff options
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go index addbc28b0..e01a2ba7b 100644 --- a/java/app.go +++ b/java/app.go @@ -22,9 +22,8 @@ import ( "path/filepath" "strings" - "android/soong/testing" - "github.com/google/blueprint" + "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" "android/soong/android" @@ -227,7 +226,7 @@ func (a *AndroidApp) IsInstallable() bool { return Bool(a.properties.Installable) } -func (a *AndroidApp) ResourcesNodeDepSet() *android.DepSet[*resourcesNode] { +func (a *AndroidApp) ResourcesNodeDepSet() depset.DepSet[*resourcesNode] { return a.aapt.resourcesNodesDepSet } @@ -1443,7 +1442,6 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_prefer32_data)...) - android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{ InstalledFiles: a.data, OutputFile: a.OutputFile(), |