Convert bugreportz, cmd and performanced to Android.bp
See build/soong/README.md for more information. Test: m bugreportz cmd performanced Test: atest bugreportz_test Test: atest performance_service_tests (failed in the same way on cf before/after) Change-Id: I643176ec07773ab2efca4b04edc2af82b6395793
This commit is contained in:
Dan Willemsen
parent
cdd531c962
commit
d960894396
6 changed files with 115 additions and 121 deletions
44
cmds/bugreportz/Android.bp
Normal file
44
cmds/bugreportz/Android.bp
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
// 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",
|
||||
],
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
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)
|
||||
18
cmds/cmd/Android.bp
Normal file
18
cmds/cmd/Android.bp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
cc_binary {
|
||||
name: "cmd",
|
||||
|
||||
srcs: ["cmd.cpp"],
|
||||
|
||||
shared_libs: [
|
||||
"libutils",
|
||||
"liblog",
|
||||
"libselinux",
|
||||
"libbinder",
|
||||
],
|
||||
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-DXP_UNIX",
|
||||
],
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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)
|
||||
53
services/vr/performanced/Android.bp
Normal file
53
services/vr/performanced/Android.bp
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
// 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"],
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
# 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)
|
||||
|
||||
sourceFiles := \
|
||||
cpu_set.cpp \
|
||||
main.cpp \
|
||||
performance_service.cpp \
|
||||
task.cpp
|
||||
|
||||
staticLibraries := \
|
||||
libperformance \
|
||||
libvr_manager
|
||||
|
||||
sharedLibraries := \
|
||||
libbinder \
|
||||
libbase \
|
||||
libcutils \
|
||||
liblog \
|
||||
libutils \
|
||||
libpdx_default_transport \
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := $(sourceFiles)
|
||||
LOCAL_CFLAGS := -DLOG_TAG=\"performanced\"
|
||||
LOCAL_CFLAGS += -DTRACE=0
|
||||
LOCAL_CFLAGS += -Wall -Werror
|
||||
LOCAL_STATIC_LIBRARIES := $(staticLibraries)
|
||||
LOCAL_SHARED_LIBRARIES := $(sharedLibraries)
|
||||
LOCAL_MODULE := performanced
|
||||
LOCAL_INIT_RC := performanced.rc
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := performance_service_tests.cpp
|
||||
LOCAL_STATIC_LIBRARIES := $(staticLibraries) libgtest_main
|
||||
LOCAL_SHARED_LIBRARIES := $(sharedLibraries)
|
||||
LOCAL_MODULE := performance_service_tests
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
include $(BUILD_NATIVE_TEST)
|
||||
Loading…
Reference in a new issue