diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-04-03 12:44:40 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-04-03 12:44:40 -0700 |
| commit | feefeb4f308261907f5ea5705d66736d45633a27 (patch) | |
| tree | 6e9aba15640fdaa34cdc7a24cf6003326c939360 /tools/aapt2 | |
| parent | ca2fc353c2b07e24e297fdc8426c7abd601d908b (diff) | |
| download | frameworks_base-feefeb4f308261907f5ea5705d66736d45633a27.zip frameworks_base-feefeb4f308261907f5ea5705d66736d45633a27.tar.gz frameworks_base-feefeb4f308261907f5ea5705d66736d45633a27.tar.bz2 | |
AAPT2 statically link libz on Windows builds
Change-Id: I2abf47273173c470c04e00a54aa619fe1ce0e745
Diffstat (limited to 'tools/aapt2')
| -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 e61fd29..9cea176 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 |