Merge "libbinder: static on host" am: 5dd4cec081 am: ab3906d3ce am: d58265bfff
am: c3bbfeb393

Change-Id: Idc44f4e595f3ecd5b7a44c2b3ab0a9d6bab4b229
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index f3d4b7e..296e3f6 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -51,7 +51,7 @@
     "IpPrefix.cpp",
 ]
 
-cc_library_shared {
+cc_library {
     name: "libbinder",
 
     // for vndbinder
@@ -101,6 +101,11 @@
     target: {
         android: {
             srcs: libbinder_device_interface_sources,
+
+            // NOT static to keep the wire protocol unfrozen
+            static: {
+                enabled: false,
+            },
         },
         vendor: {
             exclude_srcs: libbinder_device_interface_sources,