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

Commit e643ccba authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove circular dependency." into jb-mr1-dev

parents a3b71fa5 8d5ec2a3
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -102,10 +102,6 @@ LOCAL_SRC_FILES += \
        chromium_http_stub.cpp
LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1

ifneq ($(TARGET_BUILD_PDK), true)
LOCAL_REQUIRED_MODULES := libstagefright_chromium_http
endif

LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk

@@ -119,6 +115,8 @@ LOCAL_CFLAGS += -Wno-multichar

LOCAL_MODULE:= libstagefright

LOCAL_MODULE_TAGS := optional

include $(BUILD_SHARED_LIBRARY)

include $(call all-makefiles-under,$(LOCAL_PATH))