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

Commit bd5609f0 authored by Jiyong Park's avatar Jiyong Park
Browse files

DO NOT MERGE: Merge commit '89f1f99d' into manual_merge_89f1f99d64 

Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iac8c115a9e2195cd2df1ba507985e5f663587502
parents 4c86beec 89f1f99d

drm/mediadrm/plugins/clearkey/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -38,12 +38,17 @@ cc_library_shared { 
    shared_libs: [

        "libcrypto",

        "liblog",

        "libstagefright_foundation",

        "libstagefright_foundation_vendor",

        "libutils",

    ],



    static_libs: ["libjsmn"],



    include_dirs: [

        "frameworks/native/include",

        "frameworks/av/include",

    ],



    export_include_dirs: ["."],

    export_static_lib_headers: ["libjsmn"],

}

drm/mediadrm/plugins/clearkey/tests/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


cc_test {

    name: "ClearKeyDrmUnitTest",

    vendor: true,



    srcs: [

        "AesCtrDecryptorUnittest.cpp",
@@ -30,7 +31,7 @@ cc_test { 
        "libcrypto",

        "libdrmclearkeyplugin",

        "liblog",

        "libstagefright_foundation",

        "libstagefright_foundation_vendor",

        "libutils",

    ],

}

media/libeffects/downmix/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -Wall -Werror



LOCAL_HEADER_LIBRARIES += libhardware_headers

include $(BUILD_SHARED_LIBRARY)

media/libeffects/lvm/wrapper/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ LOCAL_C_INCLUDES += \ 
	$(LOCAL_PATH)/../lib/Bundle/lib/ \

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



LOCAL_HEADER_LIBRARIES += libhardware_headers

include $(BUILD_SHARED_LIBRARY)
@@ -62,4 +63,5 @@ LOCAL_C_INCLUDES += \ 
    $(LOCAL_PATH)/../lib/Reverb/lib/ \

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



LOCAL_HEADER_LIBRARIES += libhardware_headers

include $(BUILD_SHARED_LIBRARY)

media/libeffects/preprocessing/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,4 +31,5 @@ LOCAL_CFLAGS += \ 
LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -Wall -Werror



LOCAL_HEADER_LIBRARIES += libhardware_headers

include $(BUILD_SHARED_LIBRARY)