From 29788aad615e7105180cd84aa6474347f20ee95c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 13 Jul 2018 21:23:59 -0700
Subject: [PATCH] Fix .kotlin_builtins glob

The files in kotlin jars seem to be called .kotlin_builtins, not
.kotlin_builtin.

Test: m checkbuild
Change-Id: I541aea758bbef6bb23632836cceb8339b82ffdff
---
 java/java.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java.go b/java/java.go
index 89aa0e14f..cf0aafdf0 100644
--- 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)