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

Commit 96c27559 authored by Leon Scroggins's avatar Leon Scroggins Committed by The Android Open Source Project
Browse files

Merge commit 'goog/master'

parents 90402eb6 894fa6cc

media/jni/Android.mk

+22 −23
Original line number Diff line number Diff line 
ifneq ($(BUILD_WITHOUT_PV),true)

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



ifneq ($(BUILD_WITHOUT_PV),true)



LOCAL_SRC_FILES:= \

    android_media_MediaPlayer.cpp \

    android_media_MediaRecorder.cpp \
@@ -12,8 +11,9 @@ LOCAL_SRC_FILES:= \ 
    android_media_ResampleInputStream.cpp



LOCAL_SHARED_LIBRARIES := \

	libopencoreplayer \

	libopencoreauthor \

    libopencore_player \

    libopencore_author \

    libomx_amrenc_sharedlibrary \

    libandroid_runtime \

    libnativehelper \

    libcutils \
@@ -38,7 +38,6 @@ LOCAL_MODULE:= libmedia_jni 


include $(BUILD_SHARED_LIBRARY)



endif



# build libsoundpool.so

include $(LOCAL_PATH)/soundpool/Android.mk

endif

media/jni/android_media_AmrInputStream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize 
    encodeProps.iInNumChannels = 1;

    encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR;

    encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2;

    encodeProps.iBitStreamFormatIf2 = false;

    encodeProps.iBitStreamFormat = false;

    encodeProps.iAudioObjectType = 0;

    encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;

    encodeProps.iOutNumChannels = encodeProps.iInNumChannels;

media/libmediaplayerservice/Android.mk

+14 −26
Original line number Diff line number Diff line
@@ -7,16 +7,12 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=               \

    MediaRecorderClient.cpp \

    MediaPlayerService.cpp \

    MetadataRetrieverClient.cpp \

    VorbisPlayer.cpp \

    MidiFile.cpp



ifneq ($(BUILD_WITHOUT_PV),true)

LOCAL_SRC_FILES+=               \

	MediaRecorderClient.cpp

endif



ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

LOCAL_LDLIBS += -ldl -lpthread

endif
@@ -26,22 +22,14 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libvorbisidec \

    libsonivox \

    libopencore_player \

    libopencore_author \

    libmedia \

    libandroid_runtime



ifneq ($(BUILD_WITHOUT_PV),true)

LOCAL_SHARED_LIBRARIES += \

	libopencoreplayer \

	libopencoreauthor

endif



LOCAL_C_INCLUDES := external/tremor/Tremor \

    $(call include-path-for, graphics corecg)



ifeq ($(BUILD_WITHOUT_PV),true)

LOCAL_CFLAGS := -DNO_OPENCORE

endif



LOCAL_MODULE:= libmediaplayerservice



include $(BUILD_SHARED_LIBRARY)