Merge "Configure timeout for fmqUnitTest"
diff --git a/Android.bp b/Android.bp
index 4636f2b..664c60d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,7 +26,6 @@
     ],
     export_include_dirs: ["include"],
     local_include_dirs: ["include"],
-    clang: true,
     srcs: [
         "EventFlag.cpp",
         "FmqInternal.cpp",
@@ -36,4 +35,7 @@
         "-Werror",
     ],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
 }