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

Commit 209cfdf4 authored by James Dong's avatar James Dong
Browse files

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

o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
parent 3b3a5b10

cmds/stagefright/Android.mk

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

        libskia libgui





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright/include \

	frameworks/base/media/libstagefright/include \

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

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

	libstagefright liblog libutils libbinder libstagefright_foundation





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

	libstagefright liblog libutils libbinder libstagefright_foundation





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

	libstagefright liblog libutils libbinder libstagefright_foundation





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

        libstagefright_foundation libmedia libmedia_native





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

        libmedia libmedia_native libgui libcutils libui





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

        libmedia libmedia_native libgui libcutils libui





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright \

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

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

media/libmedia/Android.mk

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

LOCAL_MODULE:= libmedia





LOCAL_C_INCLUDES := \

LOCAL_C_INCLUDES := \

    $(JNI_H_INCLUDE) \

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

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

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

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

    external/icu4c/common \

    external/icu4c/common \

media/libmediaplayerservice/Android.mk

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

        libstagefright_rtsp                     \





LOCAL_C_INCLUDES :=                                               \

LOCAL_C_INCLUDES :=                                               \

	$(JNI_H_INCLUDE)                                                \

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

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

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

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

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

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

media/libstagefright/Android.mk

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

        avc_utils.cpp                     \





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

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

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

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

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

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

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

media/libstagefright/chromium_http/Android.mk

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

        support.cpp





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

        $(JNI_H_INCLUDE) \

        frameworks/base/media/libstagefright \

        frameworks/base/media/libstagefright \

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

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

        external/chromium \

        external/chromium \