aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-01-22 20:07:59 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-22 20:07:59 -0800
commit17bb64e300624ff3395977f8a9b4f6dcd9543d43 (patch)
tree6bd0215133d8081533f5e5af384ed08320c573b0 /Android.bp
parent6e0d2d357f9de0f8f31939790d8a7a935982e938 (diff)
parenta2d2f2af1ae8f0f5436950ccf84651801ea148e6 (diff)
downloadbuild_soong-17bb64e300624ff3395977f8a9b4f6dcd9543d43.tar.gz
build_soong-17bb64e300624ff3395977f8a9b4f6dcd9543d43.tar.bz2
build_soong-17bb64e300624ff3395977f8a9b4f6dcd9543d43.zip
Merge changes from topic "kapt" am: e153382e17 am: cae625c754
am: a2d2f2af1a Change-Id: Ic3b8ef98f8bd5595762f6b28a7735bf57b62b1b3
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 2a9d008a..3d405618 100644
--- a/Android.bp
+++ b/Android.bp
@@ -248,6 +248,7 @@ bootstrap_go_package {
"java/java.go",
"java/jdeps.go",
"java/java_resources.go",
+ "java/kotlin.go",
"java/prebuilt_apis.go",
"java/proto.go",
"java/sdk.go",
@@ -260,6 +261,7 @@ bootstrap_go_package {
"java/dexpreopt_test.go",
"java/java_test.go",
"java/jdeps_test.go",
+ "java/kotlin_test.go",
"java/sdk_test.go",
],
pluginFor: ["soong_build"],