commit e720c0aa82e99c279f694626794dd4c86cebb00f
author Michael Butler <butlermichael@google.com> Thu Jan 24 14:00:54 2019 -0800
committer Michael Butler <butlermichael@google.com> Mon Jan 28 12:59:34 2019 -0800
tree 6b64d36a7bc3a9c90af2f9ddca18ac656acc9b73
parent a4c92a6f002448a681e533138dd883a825c903df

Allow FMQ to be double-loaded

libfmq is a shared library. When it is included by an NDK library, it
produces the following error message:

module "libneuralnetworks" variant "android_arm64_armv8-2a_kryo385_core_static":
links VNDK library "libfmq" that isn't double loadable (not also LL-NDK,
VNDK-SP, or explicitly marked as 'double_loadable').

This CL allows FMQ to be double-loaded, enabling it to be used by NDK
libraries.

Test: mma
Change-Id: I421eb7a9e4b969f1f3ef415bd580a42ac8e747bb
(cherry picked from commit 2fbcc29d05fee97eba571f6fc8317b7c2b43d78f)

Android.bp

diff --git a/Android.bp b/Android.bp
index 89d675a..a2efbb5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-subdirs = [
-    "tests",
-]
-
 cc_library {
     name: "libfmq",
     shared_libs: [
@@ -42,4 +38,5 @@
     vndk: {
         enabled: true,
     },
+    double_loadable: true,
 }