Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am: 4132f...

[android-x86/frameworks-base.git] / Android.bp

diff --git a/Android.bp b/Android.bp
index dba49ce..81d6dab 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,11 @@
 
 subdirs = [
     "libs/*",
+    "tools/*",
     "native/android",
     "native/graphics/jni",
 ]
+
+optional_subdirs = [
+    "core/tests/utiltests/jni",
+]