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

Commit 7e7f3ce6 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths." 

* commit '991aa3a7':
  Remove hardcoded ICU & OpenSSL include paths.
parents c52fb038 991aa3a7

media/libmedia/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/av/include/media/ \

    $(TOP)/frameworks/av/media/libstagefright \

    $(TOP)/external/icu/icu4c/source/common \

    $(TOP)/external/icu/icu4c/source/i18n \

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

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

media/libstagefright/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -69,11 +69,8 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/native/include/media/openmax \

        $(TOP)/external/flac/include \

        $(TOP)/external/tremolo \

        $(TOP)/external/openssl/include \

        $(TOP)/external/libvpx/libwebm \

        $(TOP)/system/netd/include \

        $(TOP)/external/icu/icu4c/source/common \

        $(TOP)/external/icu/icu4c/source/i18n \



LOCAL_SHARED_LIBRARIES := \

        libbinder \