diff options
| author | Zi Wang <mrziwang@google.com> | 2023-06-13 10:40:52 -0700 |
|---|---|---|
| committer | Zi Wang <mrziwang@google.com> | 2023-06-14 06:44:49 +0000 |
| commit | 6a66e3d01ed17fcdb7ce4b5022639c0f7442bbfb (patch) | |
| tree | 77481cd01c84082bd3d1adfe1af6d8bde8e33695 /java/kotlin.go | |
| parent | 722a2b50c65e9d476271b75c413057ca0fef346b (diff) | |
Support multiple filters in zipsync
Also applied this feature to kotlinc since it needs both java and kt files.
Test: local test and presubmits
Bug: 287071909
Change-Id: I28c725b03115aef47055448cb75412980015da15
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 9bff5ea01..f28d6c737 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -30,7 +30,7 @@ var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.RemoteRuleSupports blueprint.RuleParams{ Command: `rm -rf "$classesDir" "$headerClassesDir" "$srcJarDir" "$kotlinBuildFile" "$emptyDir" && ` + `mkdir -p "$classesDir" "$headerClassesDir" "$srcJarDir" "$emptyDir" && ` + - `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" -f "*.kt" $srcJars && ` + `${config.GenKotlinBuildFileCmd} --classpath "$classpath" --name "$name"` + ` --out_dir "$classesDir" --srcs "$out.rsp" --srcs "$srcJarDir/list"` + ` $commonSrcFilesArg --out "$kotlinBuildFile" && ` + |