Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f152caa authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

am: 863968bb

* commit '863968bb':
  AAPT2: statically link protobuf library
parents 520d526d 863968bb

tools/aapt2/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -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