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

Commit edab4257 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Merge commit '885dd713' into manual_merge_885dd71 

Change-Id: I871b103643cabab183bc24c1ce40930c7a083c79
parents 5691e540 885dd713

media/common_time/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ LOCAL_SHARED_LIBRARIES := libbinder \ 
                          libutils \

                          liblog



LOCAL_CFLAGS := -Wall -Werror



include $(BUILD_SHARED_LIBRARY)

media/ndk/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_CFLAGS += -fvisibility=hidden -D EXPORT='__attribute__ ((visibility ("default")))'



LOCAL_CFLAGS += -Werror

LOCAL_CFLAGS += -Werror -Wall



LOCAL_SHARED_LIBRARIES := \

    libbinder \

services/audioflinger/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libbinder



LOCAL_CFLAGS := -Wall -Werror



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

services/audiopolicy/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) 
LOCAL_MODULE:= libaudiopolicyservice



LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -Wall -Werror



include $(BUILD_SHARED_LIBRARY)
@@ -102,6 +103,8 @@ LOCAL_SHARED_LIBRARIES += libicuuc 
LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)



LOCAL_CFLAGS += -Wall -Werror



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicymanagerdefault
@@ -125,6 +128,8 @@ LOCAL_C_INCLUDES += \ 
    $(TOPDIR)frameworks/av/services/audiopolicy/common/include \

    $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface



LOCAL_CFLAGS := -Wall -Werror



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicymanager

services/audiopolicy/common/managerdefinitions/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ 


LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_CFLAGS := -Wall -Werror



LOCAL_MODULE := libaudiopolicycomponents



include $(BUILD_STATIC_LIBRARY)