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

Commit 23918f21 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files."

parents 062ed957 209cfdf4

cmds/stagefright/Android.mk

+0 −7
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libskia libgui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright/include \

	$(TOP)/frameworks/native/include/media/openmax \
@@ -38,7 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax
@@ -62,7 +60,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax
@@ -87,7 +84,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax
@@ -111,7 +107,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libstagefright_foundation libmedia libmedia_native



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax
@@ -135,7 +130,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax
@@ -160,7 +154,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

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

media/libmedia/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper 
LOCAL_MODULE:= libmedia



LOCAL_C_INCLUDES := \

    $(JNI_H_INCLUDE) \

    $(call include-path-for, graphics corecg) \

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

    external/icu4c/common \

media/libmediaplayerservice/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_rtsp                     \



LOCAL_C_INCLUDES :=                                               \

	$(JNI_H_INCLUDE)                                                \

	$(call include-path-for, graphics corecg)                       \

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

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

media/libstagefright/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ LOCAL_SRC_FILES:= \ 
        avc_utils.cpp                     \



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

        $(TOP)/frameworks/base/include/media/stagefright/timedtext \

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

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

media/libstagefright/chromium_http/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ LOCAL_SRC_FILES:= \ 
        support.cpp



LOCAL_C_INCLUDES:= \

        $(JNI_H_INCLUDE) \

        frameworks/base/media/libstagefright \

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

        external/chromium \