From 36f0eeaf103f269ce3568eaa2ec793ef54bb1902 Mon Sep 17 00:00:00 2001
From: Jeffrey Huang <jeffreyhuang@google.com>
Date: Wed, 12 Feb 2020 11:30:11 -0800
Subject: [PATCH] Move libstatspull to the apex

Bug: 145922701
Test: atest LibStatsPullTests
Change-Id: I159c5e6f092b35bf6576a576df95aaa266d71fa4
---
 apex/statsd/Android.bp      | 2 ++
 apex/statsd/aidl/Android.bp | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 1f9f18cd051a5..c0f84a0ba0702 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -20,6 +20,7 @@ apex {
 
 apex_defaults {
     native_shared_libs: [
+        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -28,6 +29,7 @@ apex_defaults {
         "service-statsd",
     ],
     // prebuilts: ["my_prebuilt"],
+    compile_multilib: "both",
     name: "com.android.os.statsd-defaults",
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",
diff --git a/apex/statsd/aidl/Android.bp b/apex/statsd/aidl/Android.bp
index 7c93bc73e45db..4ccdd7e734dbf 100644
--- a/apex/statsd/aidl/Android.bp
+++ b/apex/statsd/aidl/Android.bp
@@ -38,6 +38,10 @@ aidl_interface {
         },
         ndk: {
             enabled: true,
+            apex_available: [
+                "com.android.os.statsd",
+            ],
         }
-    }
+
+    },
 }