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

Commit 10113a44 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Switch to shared libpng/libz dependency."

parents 97e1d53d 5675b97f

tools/aapt/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -86,15 +86,17 @@ LOCAL_C_INCLUDES += external/zlib 
LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS

LOCAL_CFLAGS += -Wno-non-virtual-dtor



LOCAL_SHARED_LIBRARIES := \

        libpng \

        libz



LOCAL_STATIC_LIBRARIES := \

        libstlport_static \

        libandroidfw \

        libutils \

        libcutils \

        libexpat_static \

        libpng \

        liblog \

        libz

        liblog



include $(BUILD_EXECUTABLE)

endif