diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 4 | ||||
| -rw-r--r-- | java/java.go | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/java/app.go b/java/app.go index a6e651d8..74e32699 100644 --- a/java/app.go +++ b/java/app.go @@ -67,8 +67,8 @@ type AndroidApp struct { exportPackage string } -func (a *AndroidApp) JavaDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { - deps := a.javaBase.JavaDynamicDependencies(ctx) +func (a *AndroidApp) JavaDependencies(ctx AndroidJavaModuleContext) []string { + deps := a.javaBase.JavaDependencies(ctx) if !a.properties.No_standard_libraries { switch a.properties.Sdk_version { // TODO: Res_sdk_version? diff --git a/java/java.go b/java/java.go index 8b50eff4..2bd5bffa 100644 --- a/java/java.go +++ b/java/java.go @@ -145,9 +145,11 @@ type javaBase struct { installFile string } +type AndroidJavaModuleContext common.AndroidBaseContext + type JavaModuleType interface { GenerateJavaBuildActions(ctx common.AndroidModuleContext) - JavaDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string + JavaDependencies(ctx AndroidJavaModuleContext) []string } type JavaDependency interface { @@ -191,11 +193,13 @@ func (j *javaBase) BootClasspath(ctx common.AndroidBaseContext) string { var defaultJavaLibraries = []string{"core-libart", "core-junit", "ext", "framework"} -func (j *javaBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { - return j.module.JavaDynamicDependencies(ctx) +func javaDepsMutator(ctx common.AndroidBottomUpMutatorContext) { + if j, ok := ctx.Module().(JavaModuleType); ok { + ctx.AddDependency(ctx.Module(), j.JavaDependencies(ctx)...) + } } -func (j *javaBase) JavaDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { +func (j *javaBase) JavaDependencies(ctx AndroidJavaModuleContext) []string { var deps []string if !j.properties.No_standard_libraries { |