Merge "AAPT2: statically link protobuf library" into nyc-dev

2016-03-11 21:33:33 +00:00
parent e3dedf9f44 f4ab612684
commit 52db414176
1 changed files with 5 additions and 3 deletions
--- 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