diff options
| author | Anton Hansson <hansson@google.com> | 2019-02-01 07:18:26 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-01 07:18:26 -0800 |
| commit | caac4484db371ceee0ace2a944e0286af051c02b (patch) | |
| tree | 75e61dd6c282522ecdb734ff08078397b9b1a7f2 /cmds | |
| parent | 0a6f296509b6e439c545cbf9db836f8c7393d565 (diff) | |
| parent | 536426c32ff0ad5bc3fb78293af8cf0bf6918752 (diff) | |
| download | frameworks_av-caac4484db371ceee0ace2a944e0286af051c02b.tar.gz frameworks_av-caac4484db371ceee0ace2a944e0286af051c02b.tar.bz2 frameworks_av-caac4484db371ceee0ace2a944e0286af051c02b.zip | |
Merge "Convert three media binaries to Android.bp" am: 479b735392 am: 812f306ff8
am: 536426c32f
Change-Id: Ib0b891a695d613a8593b9619b908880895f16ef4
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/screenrecord/Android.bp | 55 | ||||
| -rw-r--r-- | cmds/screenrecord/Android.mk | 45 |
2 files changed, 55 insertions, 45 deletions
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) |