Merge changes I5b8522aa,I541aea75

am: cdec7e7ee1 Change-Id: Ib68f185498f593f0812f481b2c82753cd5956fa5
2018-07-16 17:20:20 -07:00
parent 20075eb84b cdec7e7ee1
commit 0907f39afd
4 changed files with 4 additions and 4 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -1034,7 +1034,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 			// TODO(pszczepaniak): Support kotlin-reflect
 			stripFiles = append(stripFiles,
 				"**/*.kotlin_module",
-				"**/*.kotlin_builtin")
+				"**/*.kotlin_builtins")
 		} else {
 			// Only add kotlin-stdlib if not using (on-device) renamed stdlib
 			// (it's expected to be on device bootclasspath)