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

Commit f6594e48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert libreplayer to blueprint"

parents afa3fee0 c6968f31
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
subdirs = [
    "proto",
    "replayer",
]
 No newline at end of file
+10 −0
Original line number Diff line number Diff line
cc_library_static {
    name: "libtrace_proto",
    srcs: [
        "src/trace.proto",
    ],
    proto: {
        type: "lite",
        export_proto_headers: true,
    },
}
+0 −28
Original line number Diff line number Diff line
#
# Copyright (C) 2016 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 := $(call all-proto-files-under, src)

LOCAL_PROTOC_OPTIMIZE_TYPE := lite

LOCAL_MODULE := libtrace_proto
LOCAL_MODULE_CLASS := STATIC_LIBRARIES

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_STATIC_LIBRARY)
+66 −0
Original line number Diff line number Diff line
cc_library_shared {
    name: "libsurfacereplayer",
    clang: true,
    srcs: [
        "BufferQueueScheduler.cpp",
        "Event.cpp",
        "Replayer.cpp",
    ],
    cppflags: [
        "-Werror",
        "-Wno-unused-parameter",
        "-Wno-format",
	"-Wno-c++98-compat-pedantic",
	"-Wno-float-conversion",
	"-Wno-disabled-macro-expansion",
	"-Wno-float-equal",
	"-Wno-sign-conversion",
	"-Wno-padded",
	"-std=c++14",
    ],
    static_libs: [
        "libtrace_proto",
    ],
    shared_libs: [
        "libEGL",
        "libGLESv2",
        "libbinder",
        "liblog",
        "libcutils",
        "libgui",
        "libui",
        "libutils",
        "libprotobuf-cpp-lite",
        "libbase",
        "libnativewindow",
    ],
    export_include_dirs: [
        ".",
    ],
}

cc_binary {
    name: "surfacereplayer",
    clang: true,
    srcs: [
        "Main.cpp",
    ],
    shared_libs: [
        "libprotobuf-cpp-lite",
        "libsurfacereplayer",
        "libutils",
        "libgui",
    ],
    static_libs: [
        "libtrace_proto",
    ],
    cppflags: [
        "-Werror",
        "-Wno-unused-parameter",
	"-Wno-c++98-compat-pedantic",
	"-Wno-float-conversion",
	"-Wno-disabled-macro-expansion",
	"-Wno-float-equal",
	"-std=c++14",
    ],
}
+0 −75
Original line number Diff line number Diff line
# Copyright 2016 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_TARGET_DIR := $(TARGET_OUT_DATA)/local/tmp

LOCAL_PATH:= $(call my-dir)

include $(call first-makefiles-under, /frameworks/native/cmds/surfacereplayer/proto)

include $(CLEAR_VARS)

LOCAL_CPPFLAGS := -Weverything -Werror
LOCAL_CPPFLAGS := -Wno-unused-parameter
LOCAL_CPPFLAGS := -Wno-format

LOCAL_MODULE := libsurfacereplayer

LOCAL_SRC_FILES := \
    BufferQueueScheduler.cpp \
    Event.cpp \
    Replayer.cpp \

LOCAL_SHARED_LIBRARIES := \
    libEGL \
    libGLESv2 \
    libbinder \
    liblog \
    libcutils \
    libgui \
    libui \
    libutils \
    libprotobuf-cpp-lite \
    libbase \
    libnativewindow \

LOCAL_STATIC_LIBRARIES := \
    libtrace_proto \

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/..

include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)

LOCAL_MODULE := surfacereplayer

LOCAL_SRC_FILES := \
    Main.cpp \

LOCAL_SHARED_LIBRARIES := \
    libprotobuf-cpp-lite \
    libsurfacereplayer \
    libutils \
    libgui \

LOCAL_STATIC_LIBRARIES := \
    libtrace_proto \

LOCAL_CPPFLAGS := -Weverything -Werror
LOCAL_CPPFLAGS := -Wno-unused-parameter

LOCAL_MODULE_PATH := $(LOCAL_TARGET_DIR)

include $(BUILD_EXECUTABLE)
Loading