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

Commit ef36d496 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Revert "Split libmedia into libmedia and libmedia_native""

parents fdac94af 78b5e82f
Loading
Loading
Loading
Loading
+35 −14
Original line number Diff line number Diff line
@@ -3,26 +3,47 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    autodetect.cpp \
    IMediaDeathNotifier.cpp \
    IMediaMetadataRetriever.cpp \
    IMediaPlayerClient.cpp \
    IMediaPlayer.cpp \
    AudioParameter.cpp
LOCAL_MODULE:= libmedia_helper
LOCAL_MODULE_TAGS := optional

include $(BUILD_STATIC_LIBRARY)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    AudioTrack.cpp \
    IAudioFlinger.cpp \
    IAudioFlingerClient.cpp \
    IAudioTrack.cpp \
    IAudioRecord.cpp \
    AudioRecord.cpp \
    AudioSystem.cpp \
    mediaplayer.cpp \
    IMediaPlayerService.cpp \
    IMediaPlayerClient.cpp \
    IMediaRecorderClient.cpp \
    IMediaPlayer.cpp \
    IMediaRecorder.cpp \
    IOMX.cpp \
    IStreamSource.cpp \
    JetPlayer.cpp \
    mediametadataretriever.cpp \
    mediaplayer.cpp \
    MediaProfiles.cpp \
    Metadata.cpp \
    mediarecorder.cpp \
    MediaScannerClient.cpp \
    IMediaMetadataRetriever.cpp \
    mediametadataretriever.cpp \
    ToneGenerator.cpp \
    JetPlayer.cpp \
    IOMX.cpp \
    IAudioPolicyService.cpp \
    MediaScanner.cpp \
    MemoryLeakTrackUtil.cpp \
    Metadata.cpp \
    Visualizer.cpp
    MediaScannerClient.cpp \
    autodetect.cpp \
    IMediaDeathNotifier.cpp \
    MediaProfiles.cpp \
    IEffect.cpp \
    IEffectClient.cpp \
    AudioEffect.cpp \
    Visualizer.cpp \
    MemoryLeakTrackUtil.cpp

LOCAL_SHARED_LIBRARIES := \
	libui libcutils libutils libbinder libsonivox libicuuc libexpat \
+2 −30
Original line number Diff line number Diff line
# FIXME remove "/../libmedia" at same time as rename
LOCAL_PATH := $(call my-dir)/../libmedia
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    AudioParameter.cpp
LOCAL_MODULE:= libmedia_helper
LOCAL_MODULE_TAGS := optional

include $(BUILD_STATIC_LIBRARY)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \
    AudioEffect.cpp \
    AudioRecord.cpp \
    AudioSystem.cpp \
    AudioTrack.cpp \
    IAudioFlingerClient.cpp \
    IAudioFlinger.cpp \
    IAudioPolicyService.cpp \
    IAudioRecord.cpp \
    IAudioTrack.cpp \
    IEffectClient.cpp \
    IEffect.cpp \
    ToneGenerator.cpp

LOCAL_SHARED_LIBRARIES := \
    libaudioutils libbinder libcutils libutils
LOCAL_SRC_FILES :=

LOCAL_MODULE:= libmedia_native

LOCAL_C_INCLUDES := \
    $(call include-path-for, audio-utils)

LOCAL_MODULE_TAGS := optional

include $(BUILD_SHARED_LIBRARY)