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

Commit 080a39e4 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

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

parents c77b3bb4 2ee7aab4

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 := -Werror -Wall

cmds/stagefright/Android.mk

+13 −13
Original line number Diff line number Diff line
@@ -16,7 +16,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
@@ -40,8 +40,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
@@ -64,8 +64,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
@@ -89,7 +89,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
@@ -112,7 +112,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
@@ -136,7 +136,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
@@ -168,10 +168,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)
@@ -203,7 +203,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

+8 −8
Original line number Diff line number Diff line
@@ -49,15 +49,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                  \

    frameworks/av/media/libstagefright/include               \

    frameworks/av/media/libstagefright/rtsp                  \

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

    frameworks/av/media/libstagefright/webm                  \

    $(LOCAL_PATH)/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/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
@@ -17,14 +17,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

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ LOCAL_SRC_FILES:= \ 
    TypedLogger.cpp



LOCAL_C_INCLUDES := \

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

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

    frameworks/av/services/audiopolicy \

    frameworks/av/services/medialog \

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



LOCAL_SHARED_LIBRARIES := \