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

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

Merge "Permit conditional registry of mediaserver extensions"

parents dacd2b01 8029ea41

media/mediaserver/Android.mk

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



ifneq ($(BOARD_USE_CUSTOM_MEDIASERVEREXTENSIONS),true)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := register.cpp

LOCAL_MODULE := libregistermsext

LOCAL_MODULE_TAGS := optional

include $(BUILD_STATIC_LIBRARY)

endif



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \
@@ -15,6 +24,9 @@ LOCAL_SHARED_LIBRARIES := \ 
	libutils \

	libbinder



LOCAL_STATIC_LIBRARIES := \

	libregistermsext



LOCAL_C_INCLUDES := \

    frameworks/av/media/libmediaplayerservice \

    frameworks/av/services/medialog \

media/mediaserver/RegisterExtensions.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef REGISTER_EXTENSIONS_H

#define REGISTER_EXTENSIONS_H



extern void registerExtensions();



#endif  // REGISTER_EXTENSIONS_H

media/mediaserver/main_mediaserver.cpp

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <binder/IServiceManager.h>

#include <cutils/properties.h>

#include <utils/Log.h>

#include "RegisterExtensions.h"



// from LOCAL_C_INCLUDES

#include "AudioFlinger.h"
@@ -127,6 +128,7 @@ int main(int argc, char** argv) 
        MediaPlayerService::instantiate();

        CameraService::instantiate();

        AudioPolicyService::instantiate();

        registerExtensions();

        ProcessState::self()->startThreadPool();

        IPCThreadState::self()->joinThreadPool();

    }

media/mediaserver/register.cpp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "RegisterExtensions.h"



void registerExtensions()

{

}