From f4ab612684ebc139b53dcc4960f99d9c025d7c8c Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Thu, 10 Mar 2016 19:24:00 -0800
Subject: [PATCH] AAPT2: statically link protobuf library

Change-Id: I0bce42dfef2f11181c6407839875c97f88445dbd
---
 tools/aapt2/Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index d311b3d41a701..85d22ffacd4ce 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -125,10 +125,12 @@ hostStaticLibs := \
 	libexpat \
 	libziparchive-host \
 	libpng \
-	libbase
+	libbase \
+	libprotobuf-cpp-lite_static
 
-hostSharedLibs := \
-	libprotobuf-cpp-lite
+# Do not add any shared libraries. AAPT2 is built to run on many
+# environments that may not have the required dependencies.
+hostSharedLibs :=
 
 ifneq ($(strip $(USE_MINGW)),)
 	hostStaticLibs += libz