Merge "Update makefiles." am: c202d17fa6
am: 70d20a497e
Change-Id: I717a93e5b3933dd1b2f8a5e9af61cb6ac8a41423
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,
}
diff --git a/neuralnetworks/1.2/Android.bp b/neuralnetworks/1.2/Android.bp
index e183a26..d5ef49d 100644
--- a/neuralnetworks/1.2/Android.bp
+++ b/neuralnetworks/1.2/Android.bp
@@ -22,3 +22,4 @@
],
gen_java: false,
}
+