commit 591171a65982b3df98dba4d928f18e8837c238d0
author Chih-hung Hsieh <chh@google.com> Thu Oct 18 18:33:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 18 18:33:21 2018 +0000
tree 915936d23e6cd6600adf93ed5442bcfb3dde8d8b
parent c202d17fa640dba30bb51437aa34d753ecc9b9c4
parent 5daaea7cdc73361e15a585f248d5b235c1fc7656

Merge "Fix implicit fallthrough warnings."

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index d53709d..6be6930 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -18,8 +18,6 @@
 
 BUILD_FRAMEWORK_COMPATIBILITY_MATRIX := $(LOCAL_PATH)/compatibility_matrix.mk
 
-my_kernel_config_data := kernel/configs
-
 # Framework Compatibility Matrix (common to all FCM versions)
 
 include $(CLEAR_VARS)

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 e183a26..d5ef49d 100644
--- a/neuralnetworks/1.2/Android.bp
+++ b/neuralnetworks/1.2/Android.bp
@@ -22,3 +22,4 @@
     ],
     gen_java: false,
 }
+