commit 2d01a56f972fc3ad05a6792574263ab4277a1ed7
author Steven Moreland <smoreland@google.com> Wed Oct 17 14:18:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 14:18:52 2018 -0700
tree 08a04d4ffd01cf16eac9101168f2be85c712f518
parent 40b0b8963b55dd3f0c364119f8d806790d7a7117
parent 4e9e47f47e88b3fd5af02483a29d085f70f30130

Merge "Update makefiles." am: c202d17fa6 am: 70d20a497e
am: 4e9e47f47e

Change-Id: I1cce7dda484ddf85556db4c03518463edb29604f

fastboot/1.0/Android.bp

diff --git a/fastboot/1.0/Android.bp b/fastboot/1.0/Android.bp
index 3267499..467fc6d 100644
--- a/fastboot/1.0/Android.bp
+++ b/fastboot/1.0/Android.bp
@@ -14,9 +14,10 @@
         "android.hidl.base@1.0",
     ],
     types: [
-        "Status",
+        "FileSystemType",
         "Result",
+        "Status",
     ],
-    gen_java: false,
+    gen_java: true,
 }
 

neuralnetworks/1.2/Android.bp

diff --git a/neuralnetworks/1.2/Android.bp b/neuralnetworks/1.2/Android.bp
index 3c4ff8b..5a661e0 100644
--- a/neuralnetworks/1.2/Android.bp
+++ b/neuralnetworks/1.2/Android.bp
@@ -24,3 +24,4 @@
     ],
     gen_java: false,
 }
+