diff options
| author | Colin Cross <ccross@android.com> | 2015-04-24 15:21:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-27 14:32:36 -0700 |
| commit | 11f5654ba6a738206ee3a52e1e2b45fe7842389c (patch) | |
| tree | 20d02a850d6ee9a5e58e7c99fc8b2deb3f8ddc27 /java | |
| parent | 957cc4e20d6897f641f3c323541c54af065e8531 (diff) | |
| download | build_soong-11f5654ba6a738206ee3a52e1e2b45fe7842389c.tar.gz build_soong-11f5654ba6a738206ee3a52e1e2b45fe7842389c.tar.bz2 build_soong-11f5654ba6a738206ee3a52e1e2b45fe7842389c.zip | |
Extract jar files to different directory than compiling
Now that we use extractPrebuilts to extract compiled classes from
jars after jarjar, it needs to extract to a different directory
than used when compiling. Extract them to extracted/classes. Also
move the classes.list and resources.list file out of the classes
directory so they don't find themselves and end up in downstream
jars.
Change-Id: I070323466858edc7e33e14207c98f77d540882f3
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index 301613b3..6a0ae619 100644 --- a/java/builder.go +++ b/java/builder.go @@ -234,9 +234,10 @@ func TransformJarJar(ctx common.AndroidModuleContext, classesJar string, rulesFi func TransformPrebuiltJarToClasses(ctx common.AndroidModuleContext, prebuilt string) (classJarSpec, resourceJarSpec jarSpec) { - classDir := filepath.Join(common.ModuleOutDir(ctx), "classes") - classFileList := filepath.Join(classDir, "classes.list") - resourceFileList := filepath.Join(classDir, "resources.list") + extractedDir := filepath.Join(common.ModuleOutDir(ctx), "extracted") + classDir := filepath.Join(extractedDir, "classes") + classFileList := filepath.Join(extractedDir, "classes.list") + resourceFileList := filepath.Join(extractedDir, "resources.list") ctx.Build(pctx, blueprint.BuildParams{ Rule: extractPrebuilt, |