From 823aeffbcf95eb10a4fba1e6707f9c505503ca16 Mon Sep 17 00:00:00 2001
From: Ralph Nathan <ralphnathan@google.com>
Date: Wed, 3 Aug 2016 10:02:02 -0700
Subject: [PATCH] Convert libbinderwrapper_test_support to be a static library

Some unittests require libbinderwrapper_test_support.so and fail
because it isn't on userdebug images.

Bug: 30631078, 35804180
Test: `make dist`

(cherry picked from commit 6515f36e43082ea105115de7e34d9cd09c77220a)

Change-Id: I4d8878de8963d0cbd29d6aca4b233ba674121688
---
 libbinderwrapper/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbinderwrapper/Android.mk b/libbinderwrapper/Android.mk
index b38d262ae..c7683736b 100644
--- a/libbinderwrapper/Android.mk
+++ b/libbinderwrapper/Android.mk
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES := \
 
 include $(BUILD_SHARED_LIBRARY)
 
-# libbinderwrapper_test_support shared library
+# libbinderwrapper_test_support static library
 # ========================================================
 
 include $(CLEAR_VARS)
@@ -59,4 +59,4 @@ LOCAL_SRC_FILES := \
   binder_test_base.cc \
   stub_binder_wrapper.cc \
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)