diff options
| author | 2017-08-02 11:05:49 -0700 | |
|---|---|---|
| committer | 2017-08-11 15:24:11 -0700 | |
| commit | 74d73e2bfb016bd137a4fb7e125576b5f9a6cda4 (patch) | |
| tree | 92e6053cbdab29d2eccd28560569b864b61c4ac1 /java/builder.go | |
| parent | c4cab48c26cf7fb626a7e309f7e9aef82d681665 (diff) | |
Rename java_prebuilt_library to java_import
And make it work like bazel's java_import, using a "jars" property
instead of "srcs", and allowing multiple jars to be listed.
Test: soong tests
Change-Id: Ida2ace6412bd77b4feb423646000a1401004e0ea
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/builder.go b/java/builder.go index ed9d82c24..2e41a6047 100644 --- a/java/builder.go +++ b/java/builder.go @@ -237,11 +237,11 @@ func TransformJarJar(ctx android.ModuleContext, classesJar android.Path, rulesFi } func TransformPrebuiltJarToClasses(ctx android.ModuleContext, - prebuilt android.Path) (classJarSpec, resourceJarSpec jarSpec) { + subdir string, prebuilt android.Path) (classJarSpec, resourceJarSpec jarSpec) { - classDir := android.PathForModuleOut(ctx, "extracted/classes") - classFileList := android.PathForModuleOut(ctx, "extracted/classes.list") - resourceFileList := android.PathForModuleOut(ctx, "extracted/resources.list") + classDir := android.PathForModuleOut(ctx, subdir, "classes") + classFileList := android.PathForModuleOut(ctx, subdir, "classes.list") + resourceFileList := android.PathForModuleOut(ctx, subdir, "resources.list") ctx.ModuleBuild(pctx, android.ModuleBuildParams{ Rule: extractPrebuilt, |