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

Commit 7e3eaeb2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES"

parents 0b9bb5e2 b3cd253a

cmds/screenrecord/Android.mk

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

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright/include \

	$(TOP)/frameworks/native/include/media/openmax \

	frameworks/native/include/media/openmax \

	external/jpeg



LOCAL_CFLAGS += -Wno-multichar

cmds/stagefright/Android.mk

+14 −14
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright/include \

	$(TOP)/frameworks/native/include/media/openmax \

	frameworks/native/include/media/openmax \

	external/jpeg \



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -38,8 +38,8 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax \

	$(TOP)/frameworks/native/include/media/hardware

	frameworks/native/include/media/openmax \

	frameworks/native/include/media/hardware



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -62,8 +62,8 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax \

	$(TOP)/frameworks/native/include/media/hardware

	frameworks/native/include/media/openmax \

	frameworks/native/include/media/hardware



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -87,7 +87,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -110,7 +110,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -133,7 +133,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -157,7 +157,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -189,10 +189,10 @@ LOCAL_SHARED_LIBRARIES := \ 
	libRScpp \



LOCAL_C_INCLUDES:= \

	$(TOP)/frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax \

	$(TOP)/frameworks/rs/cpp \

	$(TOP)/frameworks/rs \

	frameworks/av/media/libstagefright \

	frameworks/native/include/media/openmax \

	frameworks/rs/cpp \

	frameworks/rs \



intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)

LOCAL_C_INCLUDES += $(intermediates)
@@ -221,7 +221,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

media/libmediaplayerservice/Android.mk

+9 −9
Original line number Diff line number Diff line
@@ -44,15 +44,15 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia



LOCAL_C_INCLUDES :=                                                 \

    $(TOP)/frameworks/av/media/libstagefright/include               \

    $(TOP)/frameworks/av/media/libstagefright/rtsp                  \

    $(TOP)/frameworks/av/media/libstagefright/wifi-display          \

    $(TOP)/frameworks/av/media/libstagefright/webm                  \

    $(TOP)/frameworks/av/include/media                              \

    $(TOP)/frameworks/av/include/camera                             \

    $(TOP)/frameworks/native/include/media/openmax                  \

    $(TOP)/frameworks/native/include/media/hardware                 \

    $(TOP)/external/tremolo/Tremolo                                 \

    frameworks/av/media/libstagefright/include               \

    frameworks/av/media/libstagefright/rtsp                  \

    frameworks/av/media/libstagefright/wifi-display          \

    frameworks/av/media/libstagefright/webm                  \

    frameworks/av/include/media                              \

    frameworks/av/include/camera                             \

    frameworks/native/include/media/openmax                  \

    frameworks/native/include/media/hardware                 \

    external/tremolo/Tremolo                                 \



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

media/libmediaplayerservice/nuplayer/Android.mk

+8 −8
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ LOCAL_SRC_FILES:= \ 
        StreamingSource.cpp             \



LOCAL_C_INCLUDES := \

	$(TOP)/frameworks/av/media/libstagefright                     \

	$(TOP)/frameworks/av/media/libstagefright/httplive            \

	$(TOP)/frameworks/av/media/libstagefright/include             \

	$(TOP)/frameworks/av/media/libstagefright/mpeg2ts             \

	$(TOP)/frameworks/av/media/libstagefright/rtsp                \

	$(TOP)/frameworks/av/media/libstagefright/timedtext           \

	$(TOP)/frameworks/av/media/libmediaplayerservice              \

	$(TOP)/frameworks/native/include/media/openmax

	frameworks/av/media/libstagefright                     \

	frameworks/av/media/libstagefright/httplive            \

	frameworks/av/media/libstagefright/include             \

	frameworks/av/media/libstagefright/mpeg2ts             \

	frameworks/av/media/libstagefright/rtsp                \

	frameworks/av/media/libstagefright/timedtext           \

	frameworks/av/media/libmediaplayerservice              \

	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Werror -Wall

services/audioflinger/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ LOCAL_SRC_FILES:= \ 
    StateQueue.cpp



LOCAL_C_INCLUDES := \

    $(TOPDIR)frameworks/av/services/audiopolicy \

    $(TOPDIR)frameworks/av/services/medialog \

    $(TOPDIR)external/sonic \

    frameworks/av/services/audiopolicy \

    frameworks/av/services/medialog \

    external/sonic \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)