diff options
| author | 2015-04-03 19:45:44 +0000 | |
|---|---|---|
| committer | 2015-04-03 19:45:45 +0000 | |
| commit | f100252f665df75b7be4d5ba75166b185fb8035e (patch) | |
| tree | dab529c05ed89614e1f230c0c64d7552372593ef | |
| parent | fd2b4674ecbd4ddc15e0599c18984fc304c864f9 (diff) | |
| parent | feefeb4f308261907f5ea5705d66736d45633a27 (diff) | |
Merge "AAPT2 statically link libz on Windows builds"
| -rw-r--r-- | tools/aapt2/Android.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index e61fd29fc220..9cea17646bc6 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -70,8 +70,8 @@ testSources := \ XmlFlattener_test.cpp cIncludes := +hostLdLibs := -hostLdLibs := -lz hostStaticLibs := \ libandroidfw \ libutils \ @@ -80,6 +80,12 @@ hostStaticLibs := \ libexpat \ libziparchive-host +ifneq ($(strip $(USE_MINGW)),) + hostStaticLibs += libz +else + hostLdLibs += -lz +endif + cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG cppFlags := -std=c++11 -Wno-missing-field-initializers |