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

Commit ca933096 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Remove mediadrm service"

parents 88468e16 cbf4bb0e
Loading
Loading
Loading
Loading

services/mediadrm/Android.mk

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line
# Copyright 2014 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.

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    main_mediadrmserver.cpp

LOCAL_HEADER_LIBRARIES:= \
    libmedia_headers \
    libmediadrm_headers

LOCAL_SHARED_LIBRARIES:= \
    libbinder \
    liblog \
    libmedia \
    libmediadrm \
    libutils \
    libhidlbase \
    libhidlmemory \
    android.hardware.drm@1.0 \
    android.hardware.drm@1.1 \
    android.hardware.drm@1.2

LOCAL_CFLAGS += -Wall -Wextra -Werror

LOCAL_MODULE:= mediadrmserver

# TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to
# 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit,
# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as
# 64-bit.
ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
LOCAL_32_BIT_ONLY := true
endif

LOCAL_INIT_RC := mediadrmserver.rc

include $(BUILD_EXECUTABLE)

services/mediadrm/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line
jtinker@google.com
marcone@google.com
+0 −36
Original line number Diff line number Diff line
/*
**
** Copyright 2008, 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.
*/

#define LOG_TAG "mediadrmserver"
//#define LOG_NDEBUG 0

#include <signal.h>
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>

using namespace android;

/*
 * Keep mediadrmserver in case it is referenced by build files we don't know of.
 * todo(robertshih): remove after verifying with `build_test.bash --dist --incremental`
 */
int main()
{
    signal(SIGPIPE, SIG_IGN);
    ProcessState::self()->startThreadPool();
    IPCThreadState::self()->joinThreadPool();
}
+0 −6
Original line number Diff line number Diff line
service mediadrm /system/bin/mediadrmserver
    class main
    user media
    group mediadrm drmrpc
    ioprio rt 4
    writepid /dev/cpuset/foreground/tasks