Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe am: 8c8bb25089

Browse Source 
am: 63dc310e6a

Change-Id: I645d077dd656f84446f77fd91c169fd7b977e661
This commit is contained in:
Colin Cross
2016-08-26 20:40:27 +00:00
committed by android-build-merger
parent 214f2fe7b4 63dc310e6a
commit e3cd4b394c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Android.mk
View File

@@ -61,7 +61,7 @@ aaptHostStaticLibs := \
liblog \ liblog \
libcutils \ libcutils \
libexpat \ libexpat \
libziparchive-host \ libziparchive \
libbase libbase
aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"

2
tools/aapt2/Android.mk
View File

@@ -127,7 +127,7 @@ hostStaticLibs := \
liblog \ liblog \
libcutils \ libcutils \
libexpat \ libexpat \
libziparchive-host \ libziparchive \
libpng \ libpng \
libbase \ libbase \
libprotobuf-cpp-lite libprotobuf-cpp-lite

2
tools/split-select/Android.mk
View File

@@ -51,7 +51,7 @@ hostStaticLibs := \
liblog \ liblog \
libcutils \ libcutils \
libexpat \ libexpat \
libziparchive-host \ libziparchive \
libbase libbase
cFlags := -Wall -Werror cFlags := -Wall -Werror