Commit 94b36c99 authored Oct 15, 2020 by Treehugger Robot Committed by Automerger Merge Worker Oct 15, 2020

Merge "Add empty tag support for java_import" am: faf30e19 am: 479ed0c3...

Merge "Add empty tag support for java_import" am: faf30e19 am: 479ed0c3 am: 812f4941 am: f249499d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462684

Change-Id: I48f3bfdd19b723dc4b7c61c5a95f054031ebf23c

java/java.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -2731,7 +2731,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {

		func (j *Import) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case ".jar":
		case "", ".jar":
		return android.Paths{j.combinedClasspathFile}, nil
		default:
		return nil, fmt.Errorf("unsupported module reference tag %q", tag)