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

Commit 559bf283 authored by James Dong's avatar James Dong Committed by Anatol Pomozov
Browse files

AV Android make files changes 

o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc

Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
parent b0b2b4d8

cmds/stagefright/Android.mk

+8 −8
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ LOCAL_SHARED_LIBRARIES := \ 
        libjpeg libgui



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright/include \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright/include \

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

	external/jpeg \
@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar
@@ -60,7 +60,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar
@@ -84,7 +84,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright liblog libutils libbinder libstagefright_foundation



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar
@@ -107,7 +107,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libstagefright_foundation libmedia libmedia_native



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar
@@ -130,7 +130,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar
@@ -154,7 +154,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	frameworks/base/media/libstagefright \

	frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar

drm/common/Android.mk

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



LOCAL_C_INCLUDES := \

    $(TOP)/frameworks/base/include \

    $(TOP)/frameworks/base/drm/libdrmframework/include \

    $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include

    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/av/drm/libdrmframework/include \

    $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include



LOCAL_MODULE:= libdrmframeworkcommon

drm/drmserver/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon



LOCAL_C_INCLUDES := \

    $(TOP)/frameworks/base/include \

    $(TOP)/frameworks/base/drm/libdrmframework/include \

    $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include

    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/av/drm/libdrmframework/include \

    $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include



LOCAL_MODULE:= drmserver

drm/libdrmframework/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libdrmframeworkcommon



LOCAL_C_INCLUDES += \

    $(TOP)/frameworks/base/drm/libdrmframework/include \

    $(TOP)/frameworks/base/include

    $(TOP)/frameworks/av/drm/libdrmframework/include \

    $(TOP)/frameworks/av/include

drm/libdrmframework/plugins/common/util/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -26,12 +26,10 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libdl \

    libdvm \

    libandroid_runtime \

    libnativehelper \

    liblog





base := frameworks/base

base := frameworks/av



LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE) \