Merge "Convert three media binaries to Android.bp" (479b7353) · Commits · e / os / android_frameworks_av

cmds/screenrecord/Android.bp

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		// 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",
		]
		}

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		# 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)

0 → 100644

+46 −0

Original line number	Diff line number	Diff line

		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",
		],

		}

deleted100644 → 0

+0 −41

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
		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)

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		// 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,

		}