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

Commit 12498515 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "stagefright: compile without chromium for pdk builds"

parents 9b0e5991 08210136

media/libstagefright/Android.mk

+8 −5
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ LOCAL_C_INCLUDES:= \ 
LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

        libbinder \

        libbinder \

        libcamera_client \

        libcamera_client \

        libchromium_net \

        libcrypto \

        libcrypto \

        libcutils \

        libcutils \

        libdl \

        libdl \
@@ -101,14 +100,18 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_httplive \

        libstagefright_httplive \

        libstagefright_id3 \

        libstagefright_id3 \

        libFLAC \

        libFLAC \

        libstagefright_chromium_http \



ifneq ($(TARGET_BUILD_PDK), true)

LOCAL_STATIC_LIBRARIES += \

	libstagefright_chromium_http

LOCAL_SHARED_LIBRARIES += \

        libchromium_net

LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1

endif





LOCAL_SHARED_LIBRARIES += libstlport

LOCAL_SHARED_LIBRARIES += libstlport

include external/stlport/libstlport.mk

include external/stlport/libstlport.mk





# TODO: Chromium is always available, so this flag can be removed.

LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1



LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

        libstagefright_enc_common \

        libstagefright_enc_common \

        libstagefright_avc_common \

        libstagefright_avc_common \

media/libstagefright/chromium_http/Android.mk

+2 −0
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)





ifneq ($(TARGET_BUILD_PDK), true)

include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_SRC_FILES:=       \

LOCAL_SRC_FILES:=       \
@@ -21,3 +22,4 @@ include external/stlport/libstlport.mk 
LOCAL_MODULE:= libstagefright_chromium_http

LOCAL_MODULE:= libstagefright_chromium_http





include $(BUILD_STATIC_LIBRARY)

include $(BUILD_STATIC_LIBRARY)

endif