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

Commit bb4ed9aa authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 815d9bb1: Merge "Add a static dependency on libbase." 

* commit '815d9bb1':
  Add a static dependency on libbase.
parents 2d954c7b 815d9bb1

libs/androidfw/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ LOCAL_SRC_FILES:= $(deviceSources) 
LOCAL_C_INCLUDES := \

    external/zlib \

    system/core/include

LOCAL_STATIC_LIBRARIES := libziparchive

LOCAL_STATIC_LIBRARIES := libziparchive libbase

LOCAL_SHARED_LIBRARIES := \

    libbinder \

    liblog \

tools/aapt/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ aaptHostStaticLibs := \ 
    libutils \

    libcutils \

    libexpat \

    libziparchive-host

    libziparchive-host \

    libbase



aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"

aaptCFlags += -Wall -Werror

tools/split-select/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ hostStaticLibs := \ 
    libutils \

    libcutils \

    libexpat \

    libziparchive-host

    libziparchive-host \

    libbase



cFlags := -Wall -Werror