From 3ee26944b082def647fe5bb2b75116ffb0267059 Mon Sep 17 00:00:00 2001 From: James Dong Date: Sat, 24 Mar 2012 10:48:40 -0700 Subject: Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files. o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d --- cmds/stagefright/Android.mk | 7 ------- media/libmedia/Android.mk | 1 - media/libmediaplayerservice/Android.mk | 1 - media/libstagefright/Android.mk | 1 - media/libstagefright/chromium_http/Android.mk | 1 - media/libstagefright/httplive/Android.mk | 1 - media/libstagefright/matroska/Android.mk | 1 - media/libstagefright/mpeg2ts/Android.mk | 1 - media/libstagefright/omx/Android.mk | 2 -- media/libstagefright/omx/tests/Android.mk | 1 - media/libstagefright/rtsp/Android.mk | 2 -- media/libstagefright/timedtext/Android.mk | 1 - 12 files changed, 20 deletions(-) diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 30be7fa..8b55c8f 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -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 diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 21e8f29..c34e23b 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -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 \ diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index ba5c776..4c6e0bd 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -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 \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 7d7bd7d..65a947a 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -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 \ diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index e37b4a8..6d5dcfb 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -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 \ diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index a5990c3..90cb448 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -8,7 +8,6 @@ LOCAL_SRC_FILES:= \ M3UParser.cpp \ LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/openssl/include diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index e67da4c..2cccb4f 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -5,7 +5,6 @@ LOCAL_SRC_FILES:= \ MatroskaExtractor.cpp LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/external/libvpx/mkvparser \ $(TOP)/frameworks/native/include/media/openmax \ diff --git a/media/libstagefright/mpeg2ts/Android.mk b/media/libstagefright/mpeg2ts/Android.mk index ac4c2a1..eaa139d 100644 --- a/media/libstagefright/mpeg2ts/Android.mk +++ b/media/libstagefright/mpeg2ts/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES:= \ MPEG2TSExtractor.cpp \ LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index 083c7ef..d20ecb6 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -1,8 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) - LOCAL_SRC_FILES:= \ OMX.cpp \ OMXMaster.cpp \ diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 07d47a8..6aa7470 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -8,7 +8,6 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright libbinder libmedia libutils libstagefright_foundation LOCAL_C_INCLUDES := \ - $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index b3bc37c..e0fe59b 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -18,7 +18,6 @@ LOCAL_SRC_FILES:= \ ASessionDescription.cpp \ LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/openssl/include @@ -45,7 +44,6 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_rtsp LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk index d2d5f7b..58ef9e3 100644 --- a/media/libstagefright/timedtext/Android.mk +++ b/media/libstagefright/timedtext/Android.mk @@ -11,7 +11,6 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS += -Wno-multichar LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/include/media/stagefright/timedtext \ $(TOP)/frameworks/base/media/libstagefright -- cgit v1.1