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

Commit 30ac3560 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert bugreportz, cmd and performanced to Android.bp" am: c435db5d am: 189f7aa9 

am: c3f5af4e

Change-Id: I04d3244db2787615b34466ef7b2a108ac7a6d83e
parents c0e95045 c3f5af4e

cmds/bugreportz/Android.bp

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// bugreportz

// ==========

cc_binary {

    name: "bugreportz",



    srcs: [

        "bugreportz.cpp",

        "main.cpp",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],



    shared_libs: [

        "libbase",

        "libcutils",

    ],

}



// bugreportz_test

// ===============

cc_test {

    name: "bugreportz_test",

    test_suites: ["device-tests"],



    cflags: [

        "-Werror",

        "-Wall",

    ],



    srcs: [

        "bugreportz.cpp",

        "bugreportz_test.cpp",

    ],



    static_libs: ["libgmock"],



    shared_libs: [

        "libbase",

        "libutils",

    ],

}

cmds/bugreportz/Android.mk

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



# bugreportz

# ==========



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

   bugreportz.cpp \

   main.cpp \



LOCAL_MODULE:= bugreportz



LOCAL_CFLAGS := -Werror -Wall



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \



include $(BUILD_EXECUTABLE)



# bugreportz_test

# ===============



include $(CLEAR_VARS)



LOCAL_MODULE := bugreportz_test

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := -Werror -Wall



LOCAL_SRC_FILES := \

    bugreportz.cpp \

    bugreportz_test.cpp \



LOCAL_STATIC_LIBRARIES := \

    libgmock \



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libutils \



include $(BUILD_NATIVE_TEST)

cmds/cmd/Android.bp

0 → 100644
+18 −0
Original line number Diff line number Diff line 
cc_binary {

    name: "cmd",



    srcs: ["cmd.cpp"],



    shared_libs: [

        "libutils",

        "liblog",

        "libselinux",

        "libbinder",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-DXP_UNIX",

    ],

}

cmds/cmd/Android.mk

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	cmd.cpp



LOCAL_SHARED_LIBRARIES := \

	libutils \

	liblog \

    libselinux \

	libbinder



LOCAL_CFLAGS := -Wall -Werror



LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE)



ifeq ($(TARGET_OS),linux)

	LOCAL_CFLAGS += -DXP_UNIX

	#LOCAL_SHARED_LIBRARIES += librt

endif



LOCAL_MODULE:= cmd



include $(BUILD_EXECUTABLE)

services/vr/performanced/Android.bp

0 → 100644
+53 −0
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.



cc_defaults {

    name: "performanced_defaults",

    static_libs: [

        "libperformance",

        "libvr_manager",

    ],

    shared_libs: [

        "libbinder",

        "libbase",

        "libcutils",

        "liblog",

        "libutils",

        "libpdx_default_transport",

    ],

}



cc_binary {

    name: "performanced",

    defaults: ["performanced_defaults"],

    srcs: [

        "cpu_set.cpp",

        "main.cpp",

        "performance_service.cpp",

        "task.cpp",

    ],

    cflags: [

        "-DLOG_TAG=\"performanced\"",

        "-DTRACE=0",

        "-Wall",

        "-Werror",

    ],

    init_rc: ["performanced.rc"],

}



cc_test {

    name: "performance_service_tests",

    defaults: ["performanced_defaults"],

    srcs: ["performance_service_tests.cpp"],

}