From 33de46e8f32aaf803bc4e2c0efebc15660d7045e Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 1 Feb 2019 11:17:57 +0000 Subject: [PATCH] Convert three media binaries to Android.bp This converts mediaserver, mediametrics and screenrecord and the libraries they depend on to Android.bp See build/soong/README.md for more information. Bug: 122331945 Bug: 80410283 Test: boot blueline Test: youtube Test: screenrecord Change-Id: I132b8b4f7965449df68fb1544034a7241c594a63 --- cmds/screenrecord/Android.bp | 55 ++++++++++++++++++++++++ cmds/screenrecord/Android.mk | 45 ------------------- media/mediaserver/Android.bp | 46 ++++++++++++++++++++ media/mediaserver/Android.mk | 41 ------------------ services/mediaanalytics/Android.bp | 49 +++++++++++++++++++++ services/mediaanalytics/Android.mk | 47 -------------------- services/mediaresourcemanager/Android.bp | 28 ++++++++++++ services/mediaresourcemanager/Android.mk | 20 --------- 8 files changed, 178 insertions(+), 153 deletions(-) create mode 100644 cmds/screenrecord/Android.bp delete mode 100644 cmds/screenrecord/Android.mk create mode 100644 media/mediaserver/Android.bp delete mode 100644 media/mediaserver/Android.mk create mode 100644 services/mediaanalytics/Android.bp delete mode 100644 services/mediaanalytics/Android.mk create mode 100644 services/mediaresourcemanager/Android.bp delete mode 100644 services/mediaresourcemanager/Android.mk diff --git a/cmds/screenrecord/Android.bp b/cmds/screenrecord/Android.bp new file mode 100644 index 0000000000..86476cd0ca --- /dev/null +++ b/cmds/screenrecord/Android.bp @@ -0,0 +1,55 @@ +// Copyright 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. + +cc_binary { + name: "screenrecord", + + srcs: [ + "screenrecord.cpp", + "EglWindow.cpp", + "FrameOutput.cpp", + "TextRenderer.cpp", + "Overlay.cpp", + "Program.cpp", + ], + + shared_libs: [ + "libstagefright", + "libmedia", + "libmedia_omx", + "libutils", + "libbinder", + "libstagefright_foundation", + "libjpeg", + "libui", + "libgui", + "libcutils", + "liblog", + "libEGL", + "libGLESv2", + ], + + include_dirs: [ + "frameworks/av/media/libstagefright", + "frameworks/av/media/libstagefright/include", + "frameworks/native/include/media/openmax", + ], + + cflags: [ + "-Werror", + "-Wall", + "-Wno-multichar", + //"-UNDEBUG", + ] +} diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk deleted file mode 100644 index 5e83ed6691..0000000000 --- a/cmds/screenrecord/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 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. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - screenrecord.cpp \ - EglWindow.cpp \ - FrameOutput.cpp \ - TextRenderer.cpp \ - Overlay.cpp \ - Program.cpp - -LOCAL_SHARED_LIBRARIES := \ - libstagefright libmedia libmedia_omx libutils libbinder libstagefright_foundation \ - libjpeg libui libgui libcutils liblog libEGL libGLESv2 - -LOCAL_C_INCLUDES := \ - frameworks/av/media/libstagefright \ - frameworks/av/media/libstagefright/include \ - frameworks/native/include/media/openmax \ - external/jpeg - -LOCAL_CFLAGS := -Werror -Wall -LOCAL_CFLAGS += -Wno-multichar -#LOCAL_CFLAGS += -UNDEBUG - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE:= screenrecord - -include $(BUILD_EXECUTABLE) diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp new file mode 100644 index 0000000000..16c7be996e --- /dev/null +++ b/media/mediaserver/Android.bp @@ -0,0 +1,46 @@ + +cc_library_static { + name: "libregistermsext", + srcs: ["register.cpp"], + + cflags: [ + "-Werror", + "-Wall", + ], +} + +cc_binary { + name: "mediaserver", + + srcs: ["main_mediaserver.cpp"], + + shared_libs: [ + "libresourcemanagerservice", + "liblog", + "libmediaplayerservice", + "libutils", + "libbinder", + "libandroidicu", + "android.hardware.media.omx@1.0", + ], + + static_libs: [ + "libicuandroid_utils", + "libregistermsext", + ], + + include_dirs: [ + "frameworks/av/media/libmediaplayerservice", + "frameworks/av/services/mediaresourcemanager", + ], + + compile_multilib: "32", + + init_rc: ["mediaserver.rc"], + + cflags: [ + "-Werror", + "-Wall", + ], + +} diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk deleted file mode 100644 index 1fbb85e6d0..0000000000 --- a/media/mediaserver/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -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 -LOCAL_CFLAGS := -Werror -Wall -include $(BUILD_STATIC_LIBRARY) -endif - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_mediaserver.cpp - -LOCAL_SHARED_LIBRARIES := \ - libresourcemanagerservice \ - liblog \ - libmediaplayerservice \ - libutils \ - libbinder \ - libandroidicu \ - android.hardware.media.omx@1.0 \ - -LOCAL_STATIC_LIBRARIES := \ - libicuandroid_utils \ - libregistermsext - -LOCAL_C_INCLUDES := \ - frameworks/av/media/libmediaplayerservice \ - frameworks/av/services/mediaresourcemanager \ - -LOCAL_MODULE:= mediaserver -LOCAL_32_BIT_ONLY := true - -LOCAL_INIT_RC := mediaserver.rc - -LOCAL_CFLAGS := -Werror -Wall - -include $(BUILD_EXECUTABLE) diff --git a/services/mediaanalytics/Android.bp b/services/mediaanalytics/Android.bp new file mode 100644 index 0000000000..c93c120142 --- /dev/null +++ b/services/mediaanalytics/Android.bp @@ -0,0 +1,49 @@ +// Media Statistics service +// + +cc_binary { + name: "mediametrics", + + srcs: [ + "main_mediametrics.cpp", + "MediaAnalyticsService.cpp", + ], + + shared_libs: [ + "libcutils", + "liblog", + "libmedia", + "libutils", + "libbinder", + "libdl", + "libgui", + "libmedia", + "libmediautils", + "libmediametrics", + "libstagefright_foundation", + "libutils", + ], + + static_libs: ["libregistermsext"], + + include_dirs: [ + "frameworks/av/media/libstagefright/include", + "frameworks/av/media/libstagefright/rtsp", + "frameworks/av/media/libstagefright/webm", + "frameworks/av/include/media", + "frameworks/av/include/camera", + "frameworks/native/include/media/openmax", + "frameworks/native/include/media/hardware", + "external/tremolo/Tremolo", + ], + + init_rc: ["mediametrics.rc"], + + cflags: [ + "-Werror", + "-Wall", + "-Wno-error=deprecated-declarations", + ], + clang: true, + +} diff --git a/services/mediaanalytics/Android.mk b/services/mediaanalytics/Android.mk deleted file mode 100644 index 5b20e61479..0000000000 --- a/services/mediaanalytics/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ -# Media Statistics service -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_mediametrics.cpp \ - MediaAnalyticsService.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - liblog \ - libmedia \ - libutils \ - libbinder \ - libdl \ - libgui \ - libmedia \ - libmediautils \ - libmediametrics \ - libstagefright_foundation \ - libutils - -LOCAL_STATIC_LIBRARIES := \ - libregistermsext - -LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/av/media/libstagefright/include \ - $(TOP)/frameworks/av/media/libstagefright/rtsp \ - $(TOP)/frameworks/av/media/libstagefright/wifi-display \ - $(TOP)/frameworks/av/media/libstagefright/webm \ - $(TOP)/frameworks/av/include/media \ - $(TOP)/frameworks/av/include/camera \ - $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/frameworks/native/include/media/hardware \ - $(TOP)/external/tremolo/Tremolo - - -LOCAL_MODULE:= mediametrics - -LOCAL_INIT_RC := mediametrics.rc - -LOCAL_CFLAGS := -Werror -Wall -Wno-error=deprecated-declarations -LOCAL_CLANG := true - -include $(BUILD_EXECUTABLE) diff --git a/services/mediaresourcemanager/Android.bp b/services/mediaresourcemanager/Android.bp new file mode 100644 index 0000000000..1c63f64753 --- /dev/null +++ b/services/mediaresourcemanager/Android.bp @@ -0,0 +1,28 @@ + + +cc_library_shared { + name: "libresourcemanagerservice", + + srcs: [ + "ResourceManagerService.cpp", + "ServiceLog.cpp", + ], + + shared_libs: [ + "libmedia", + "libmediautils", + "libbinder", + "libutils", + "liblog", + ], + + compile_multilib: "32", + + include_dirs: ["frameworks/av/include"], + + cflags: [ + "-Werror", + "-Wall", + ], + +} diff --git a/services/mediaresourcemanager/Android.mk b/services/mediaresourcemanager/Android.mk deleted file mode 100644 index 5823036aec..0000000000 --- a/services/mediaresourcemanager/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := ResourceManagerService.cpp ServiceLog.cpp - -LOCAL_SHARED_LIBRARIES := libmedia libmediautils libbinder libutils liblog - -LOCAL_MODULE:= libresourcemanagerservice - -LOCAL_32_BIT_ONLY := true - -LOCAL_C_INCLUDES += \ - frameworks/av/include - -LOCAL_CFLAGS += -Werror -Wall - -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH))