| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 1 | // Copyright 2015 Google Inc. All rights reserved. | 
|  | 2 | // | 
|  | 3 | // Licensed under the Apache License, Version 2.0 (the "License"); | 
|  | 4 | // you may not use this file except in compliance with the License. | 
|  | 5 | // You may obtain a copy of the License at | 
|  | 6 | // | 
|  | 7 | //     http://www.apache.org/licenses/LICENSE-2.0 | 
|  | 8 | // | 
|  | 9 | // Unless required by applicable law or agreed to in writing, software | 
|  | 10 | // distributed under the License is distributed on an "AS IS" BASIS, | 
|  | 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 
|  | 12 | // See the License for the specific language governing permissions and | 
|  | 13 | // limitations under the License. | 
|  | 14 |  | 
|  | 15 | package java | 
|  | 16 |  | 
|  | 17 | // This file generates the final rules for compiling all Java.  All properties related to | 
|  | 18 | // compiling should have been translated into javaBuilderFlags or another argument to the Transform* | 
|  | 19 | // functions. | 
|  | 20 |  | 
|  | 21 | import ( | 
|  | 22 | "path/filepath" | 
|  | 23 | "strings" | 
|  | 24 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 25 | "android/soong/android" | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 26 |  | 
|  | 27 | "github.com/google/blueprint" | 
| Dan Willemsen | 24f2f8d | 2015-07-15 14:34:02 -0700 | [diff] [blame] | 28 | _ "github.com/google/blueprint/bootstrap" | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 29 | ) | 
|  | 30 |  | 
|  | 31 | var ( | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 32 | pctx = android.NewPackageContext("android/soong/java") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 33 |  | 
|  | 34 | // Compiling java is not conducive to proper dependency tracking.  The path-matches-class-name | 
|  | 35 | // requirement leads to unpredictable generated source file names, and a single .java file | 
|  | 36 | // will get compiled into multiple .class files if it contains inner classes.  To work around | 
|  | 37 | // this, all java rules write into separate directories and then a post-processing step lists | 
|  | 38 | // the files in the the directory into a list file that later rules depend on (and sometimes | 
|  | 39 | // read from directly using @<listfile>) | 
| Yoshisato Yanagisawa | 572324a | 2017-06-05 17:41:50 +0900 | [diff] [blame] | 40 | javac = pctx.AndroidGomaStaticRule("javac", | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 41 | blueprint.RuleParams{ | 
| Colin Cross | 8cf1334 | 2015-04-10 15:41:49 -0700 | [diff] [blame] | 42 | Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + | 
| Colin Cross | eb54da6 | 2017-07-13 14:40:43 -0700 | [diff] [blame] | 43 | `${JavacWrapper}$javacCmd ` + | 
| Yoshisato Yanagisawa | 572324a | 2017-06-05 17:41:50 +0900 | [diff] [blame] | 44 | `-encoding UTF-8 $javacFlags $bootClasspath $classpath ` + | 
| Colin Cross | 8cf1334 | 2015-04-10 15:41:49 -0700 | [diff] [blame] | 45 | `-extdirs "" -d $outDir @$out.rsp || ( rm -rf "$outDir"; exit 41 ) && ` + | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 46 | `find $outDir -name "*.class" > $out`, | 
|  | 47 | Rspfile:        "$out.rsp", | 
|  | 48 | RspfileContent: "$in", | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 49 | }, | 
|  | 50 | "javacCmd", "javacFlags", "bootClasspath", "classpath", "outDir") | 
|  | 51 |  | 
| Colin Cross | 9d45bb7 | 2016-08-29 16:14:13 -0700 | [diff] [blame] | 52 | jar = pctx.AndroidStaticRule("jar", | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 53 | blueprint.RuleParams{ | 
|  | 54 | Command:     `$jarCmd -o $out $jarArgs`, | 
| Dan Willemsen | c94a768 | 2015-11-17 15:27:28 -0800 | [diff] [blame] | 55 | CommandDeps: []string{"$jarCmd"}, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 56 | }, | 
|  | 57 | "jarCmd", "jarArgs") | 
|  | 58 |  | 
| Colin Cross | 9d45bb7 | 2016-08-29 16:14:13 -0700 | [diff] [blame] | 59 | dx = pctx.AndroidStaticRule("dx", | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 60 | blueprint.RuleParams{ | 
| Colin Cross | 6d1e72d | 2015-04-10 17:44:24 -0700 | [diff] [blame] | 61 | Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + | 
|  | 62 | `$dxCmd --dex --output=$outDir $dxFlags $in || ( rm -rf "$outDir"; exit 41 ) && ` + | 
|  | 63 | `find "$outDir" -name "classes*.dex" > $out`, | 
| Dan Willemsen | c94a768 | 2015-11-17 15:27:28 -0800 | [diff] [blame] | 64 | CommandDeps: []string{"$dxCmd"}, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 65 | }, | 
|  | 66 | "outDir", "dxFlags") | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 67 |  | 
| Colin Cross | 9d45bb7 | 2016-08-29 16:14:13 -0700 | [diff] [blame] | 68 | jarjar = pctx.AndroidStaticRule("jarjar", | 
| Colin Cross | 65bf4f2 | 2015-04-03 16:54:17 -0700 | [diff] [blame] | 69 | blueprint.RuleParams{ | 
|  | 70 | Command:     "java -jar $jarjarCmd process $rulesFile $in $out", | 
| Dan Willemsen | c94a768 | 2015-11-17 15:27:28 -0800 | [diff] [blame] | 71 | CommandDeps: []string{"$jarjarCmd", "$rulesFile"}, | 
| Colin Cross | 65bf4f2 | 2015-04-03 16:54:17 -0700 | [diff] [blame] | 72 | }, | 
|  | 73 | "rulesFile") | 
|  | 74 |  | 
| Colin Cross | 9d45bb7 | 2016-08-29 16:14:13 -0700 | [diff] [blame] | 75 | extractPrebuilt = pctx.AndroidStaticRule("extractPrebuilt", | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 76 | blueprint.RuleParams{ | 
|  | 77 | Command: `rm -rf $outDir && unzip -qo $in -d $outDir && ` + | 
|  | 78 | `find $outDir -name "*.class" > $classFile && ` + | 
|  | 79 | `find $outDir -type f -a \! -name "*.class" -a \! -name "MANIFEST.MF" > $resourceFile || ` + | 
|  | 80 | `(rm -rf $outDir; exit 42)`, | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 81 | }, | 
|  | 82 | "outDir", "classFile", "resourceFile") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 83 | ) | 
|  | 84 |  | 
|  | 85 | func init() { | 
| Dan Willemsen | 24f2f8d | 2015-07-15 14:34:02 -0700 | [diff] [blame] | 86 | pctx.Import("github.com/google/blueprint/bootstrap") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 87 | pctx.StaticVariable("commonJdkFlags", "-source 1.7 -target 1.7 -Xmaxerrs 9999999") | 
|  | 88 | pctx.StaticVariable("javacCmd", "javac -J-Xmx1024M $commonJdkFlags") | 
| Dan Willemsen | 47ec28f | 2016-08-10 16:12:30 -0700 | [diff] [blame] | 89 | pctx.StaticVariable("jarCmd", filepath.Join("${bootstrap.ToolDir}", "soong_zip")) | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 90 | pctx.HostBinToolVariable("dxCmd", "dx") | 
|  | 91 | pctx.HostJavaToolVariable("jarjarCmd", "jarjar.jar") | 
| Yoshisato Yanagisawa | 572324a | 2017-06-05 17:41:50 +0900 | [diff] [blame] | 92 |  | 
|  | 93 | pctx.VariableFunc("JavacWrapper", func(config interface{}) (string, error) { | 
|  | 94 | if override := config.(android.Config).Getenv("JAVAC_WRAPPER"); override != "" { | 
|  | 95 | return override + " ", nil | 
|  | 96 | } | 
|  | 97 | return "", nil | 
|  | 98 | }) | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 99 | } | 
|  | 100 |  | 
|  | 101 | type javaBuilderFlags struct { | 
|  | 102 | javacFlags    string | 
|  | 103 | dxFlags       string | 
|  | 104 | bootClasspath string | 
|  | 105 | classpath     string | 
| Colin Cross | c0b06f1 | 2015-04-08 13:03:43 -0700 | [diff] [blame] | 106 | aidlFlags     string | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 107 | } | 
|  | 108 |  | 
|  | 109 | type jarSpec struct { | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 110 | fileList, dir android.Path | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 111 | } | 
|  | 112 |  | 
|  | 113 | func (j jarSpec) soongJarArgs() string { | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 114 | return "-C " + j.dir.String() + " -l " + j.fileList.String() | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 115 | } | 
|  | 116 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 117 | func TransformJavaToClasses(ctx android.ModuleContext, srcFiles android.Paths, srcFileLists android.Paths, | 
|  | 118 | flags javaBuilderFlags, deps android.Paths) jarSpec { | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 119 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 120 | classDir := android.PathForModuleOut(ctx, "classes") | 
|  | 121 | classFileList := android.PathForModuleOut(ctx, "classes.list") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 122 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 123 | javacFlags := flags.javacFlags + android.JoinWithPrefix(srcFileLists.Strings(), "@") | 
| Colin Cross | e7a9f3f | 2015-04-13 14:02:52 -0700 | [diff] [blame] | 124 |  | 
|  | 125 | deps = append(deps, srcFileLists...) | 
|  | 126 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 127 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 128 | Rule:        javac, | 
|  | 129 | Description: "javac", | 
|  | 130 | Output:      classFileList, | 
|  | 131 | Inputs:      srcFiles, | 
|  | 132 | Implicits:   deps, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 133 | Args: map[string]string{ | 
| Colin Cross | e7a9f3f | 2015-04-13 14:02:52 -0700 | [diff] [blame] | 134 | "javacFlags":    javacFlags, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 135 | "bootClasspath": flags.bootClasspath, | 
|  | 136 | "classpath":     flags.classpath, | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 137 | "outDir":        classDir.String(), | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 138 | }, | 
|  | 139 | }) | 
|  | 140 |  | 
|  | 141 | return jarSpec{classFileList, classDir} | 
|  | 142 | } | 
|  | 143 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 144 | func TransformClassesToJar(ctx android.ModuleContext, classes []jarSpec, | 
|  | 145 | manifest android.OptionalPath) android.Path { | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 146 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 147 | outputFile := android.PathForModuleOut(ctx, "classes-full-debug.jar") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 148 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 149 | deps := android.Paths{} | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 150 | jarArgs := []string{} | 
|  | 151 |  | 
|  | 152 | for _, j := range classes { | 
|  | 153 | deps = append(deps, j.fileList) | 
|  | 154 | jarArgs = append(jarArgs, j.soongJarArgs()) | 
|  | 155 | } | 
|  | 156 |  | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 157 | if manifest.Valid() { | 
|  | 158 | deps = append(deps, manifest.Path()) | 
|  | 159 | jarArgs = append(jarArgs, "-m "+manifest.String()) | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 160 | } | 
|  | 161 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 162 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 163 | Rule:        jar, | 
|  | 164 | Description: "jar", | 
|  | 165 | Output:      outputFile, | 
|  | 166 | Implicits:   deps, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 167 | Args: map[string]string{ | 
|  | 168 | "jarArgs": strings.Join(jarArgs, " "), | 
|  | 169 | }, | 
|  | 170 | }) | 
|  | 171 |  | 
|  | 172 | return outputFile | 
|  | 173 | } | 
|  | 174 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 175 | func TransformClassesJarToDex(ctx android.ModuleContext, classesJar android.Path, | 
| Colin Cross | 6d1e72d | 2015-04-10 17:44:24 -0700 | [diff] [blame] | 176 | flags javaBuilderFlags) jarSpec { | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 177 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 178 | outDir := android.PathForModuleOut(ctx, "dex") | 
|  | 179 | outputFile := android.PathForModuleOut(ctx, "dex.filelist") | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 180 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 181 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 182 | Rule:        dx, | 
|  | 183 | Description: "dx", | 
|  | 184 | Output:      outputFile, | 
|  | 185 | Input:       classesJar, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 186 | Args: map[string]string{ | 
|  | 187 | "dxFlags": flags.dxFlags, | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 188 | "outDir":  outDir.String(), | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 189 | }, | 
|  | 190 | }) | 
|  | 191 |  | 
| Colin Cross | 6d1e72d | 2015-04-10 17:44:24 -0700 | [diff] [blame] | 192 | return jarSpec{outputFile, outDir} | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 193 | } | 
|  | 194 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 195 | func TransformDexToJavaLib(ctx android.ModuleContext, resources []jarSpec, | 
|  | 196 | dexJarSpec jarSpec) android.Path { | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 197 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 198 | outputFile := android.PathForModuleOut(ctx, "javalib.jar") | 
|  | 199 | var deps android.Paths | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 200 | var jarArgs []string | 
|  | 201 |  | 
|  | 202 | for _, j := range resources { | 
|  | 203 | deps = append(deps, j.fileList) | 
|  | 204 | jarArgs = append(jarArgs, j.soongJarArgs()) | 
|  | 205 | } | 
|  | 206 |  | 
| Colin Cross | 6d1e72d | 2015-04-10 17:44:24 -0700 | [diff] [blame] | 207 | deps = append(deps, dexJarSpec.fileList) | 
|  | 208 | jarArgs = append(jarArgs, dexJarSpec.soongJarArgs()) | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 209 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 210 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 211 | Rule:        jar, | 
|  | 212 | Description: "jar", | 
|  | 213 | Output:      outputFile, | 
|  | 214 | Implicits:   deps, | 
| Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 215 | Args: map[string]string{ | 
|  | 216 | "jarArgs": strings.Join(jarArgs, " "), | 
|  | 217 | }, | 
|  | 218 | }) | 
|  | 219 |  | 
|  | 220 | return outputFile | 
|  | 221 | } | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 222 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 223 | func TransformJarJar(ctx android.ModuleContext, classesJar android.Path, rulesFile android.Path) android.Path { | 
|  | 224 | outputFile := android.PathForModuleOut(ctx, "classes-jarjar.jar") | 
|  | 225 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 226 | Rule:        jarjar, | 
|  | 227 | Description: "jarjar", | 
|  | 228 | Output:      outputFile, | 
|  | 229 | Input:       classesJar, | 
|  | 230 | Implicit:    rulesFile, | 
| Colin Cross | 65bf4f2 | 2015-04-03 16:54:17 -0700 | [diff] [blame] | 231 | Args: map[string]string{ | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 232 | "rulesFile": rulesFile.String(), | 
| Colin Cross | 65bf4f2 | 2015-04-03 16:54:17 -0700 | [diff] [blame] | 233 | }, | 
|  | 234 | }) | 
|  | 235 |  | 
|  | 236 | return outputFile | 
|  | 237 | } | 
|  | 238 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 239 | func TransformPrebuiltJarToClasses(ctx android.ModuleContext, | 
|  | 240 | prebuilt android.Path) (classJarSpec, resourceJarSpec jarSpec) { | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 241 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 242 | classDir := android.PathForModuleOut(ctx, "extracted/classes") | 
|  | 243 | classFileList := android.PathForModuleOut(ctx, "extracted/classes.list") | 
|  | 244 | resourceFileList := android.PathForModuleOut(ctx, "extracted/resources.list") | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 245 |  | 
| Colin Cross | 635c3b0 | 2016-05-18 15:37:25 -0700 | [diff] [blame] | 246 | ctx.ModuleBuild(pctx, android.ModuleBuildParams{ | 
| Colin Cross | 67a5c13 | 2017-05-09 13:45:28 -0700 | [diff] [blame] | 247 | Rule:        extractPrebuilt, | 
|  | 248 | Description: "extract classes", | 
|  | 249 | Outputs:     android.WritablePaths{classFileList, resourceFileList}, | 
|  | 250 | Input:       prebuilt, | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 251 | Args: map[string]string{ | 
| Dan Willemsen | 34cc69e | 2015-09-23 15:26:20 -0700 | [diff] [blame] | 252 | "outDir":       classDir.String(), | 
|  | 253 | "classFile":    classFileList.String(), | 
|  | 254 | "resourceFile": resourceFileList.String(), | 
| Colin Cross | e1d62a8 | 2015-04-03 16:53:05 -0700 | [diff] [blame] | 255 | }, | 
|  | 256 | }) | 
|  | 257 |  | 
|  | 258 | return jarSpec{classFileList, classDir}, jarSpec{resourceFileList, classDir} | 
|  | 259 | } |