5 files changed, 20 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 3c27339..1b466c6 100755
--- a/Android.bp
+++ b/Android.bp
@@ -99,7 +99,7 @@ cc_prebuilt_library_shared {
     licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
     installable: false,
     stl: "libc++_static",
-    compile_multilib: "32",
+    compile_multilib: "both",
     export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"],
     stubs: {
         versions: [
@@ -108,6 +108,15 @@ cc_prebuilt_library_shared {
         ],
     },
     arch: {
+        arm64: {
+            srcs: ["arm64/lib/libstatssocket.so"],
+        },
+        x86_64: {
+            srcs: ["x86_64/lib/libstatssocket.so"],
+        },
+        arm: {
+            srcs: ["arm/lib/libstatssocket.so"],
+        },
         x86: {
             srcs: ["x86/lib/libstatssocket.so"],
         },
@@ -125,7 +134,7 @@ cc_prebuilt_library_shared {
     ],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
     stl: "libc++_static",
-    compile_multilib: "32",
+    compile_multilib: "both",
     export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"],
     stubs: {
         versions: [
@@ -134,6 +143,15 @@ cc_prebuilt_library_shared {
         ],
     },
     arch: {
+        arm64: {
+            srcs: ["arm64/lib/libstatssocket.so"],
+        },
+        x86_64: {
+            srcs: ["x86_64/lib/libstatssocket.so"],
+        },
+        arm: {
+            srcs: ["arm/lib/libstatssocket.so"],
+        },
         x86: {
             srcs: ["x86/lib/libstatssocket.so"],
         },
@@ -143,7 +161,6 @@ cc_prebuilt_library_shared {
 sdk_snapshot {
     name: "statsd-module-sdk@current",
     visibility: ["//visibility:public"],
-    compile_multilib: "32",
     java_sdk_libs: ["statsd-module-sdk_framework-statsd@current"],
     native_shared_libs: ["statsd-module-sdk_libstatssocket@current"],
 }
diff --git a/arm/lib/libstatssocket.so b/arm/lib/libstatssocket.so
new file mode 100755
index 0000000..a11d10e
--- /dev/null
+++ b/arm/lib/libstatssocket.so
diff --git a/arm64/lib/libstatssocket.so b/arm64/lib/libstatssocket.so
new file mode 100755
index 0000000..5f59bde
--- /dev/null
+++ b/arm64/lib/libstatssocket.so
diff --git a/x86/lib/libstatssocket.so b/x86/lib/libstatssocket.so
index ecbc428..3f17011 100755
--- a/x86/lib/libstatssocket.so
+++ b/x86/lib/libstatssocket.so
diff --git a/x86_64/lib/libstatssocket.so b/x86_64/lib/libstatssocket.so
new file mode 100755
index 0000000..944288f
--- /dev/null
+++ b/x86_64/lib/libstatssocket.so