diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-11-16 16:08:45 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-11-16 16:44:26 -0800 |
commit | d960894396845d4fa1d28c1da394d923390dc248 (patch) | |
tree | 839a60b943a2b6d1fc9c8d2182d363a419f3deac | |
parent | cdd531c96227a3682a404f5d88b44cfbb86968e2 (diff) | |
download | native-d960894396845d4fa1d28c1da394d923390dc248.tar.gz |
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
-rw-r--r-- | cmds/bugreportz/Android.bp | 44 | ||||
-rw-r--r-- | cmds/bugreportz/Android.mk | 44 | ||||
-rw-r--r-- | cmds/cmd/Android.bp | 18 | ||||
-rw-r--r-- | cmds/cmd/Android.mk | 25 | ||||
-rw-r--r-- | services/vr/performanced/Android.bp | 53 | ||||
-rw-r--r-- | services/vr/performanced/Android.mk | 52 |
6 files changed, 115 insertions, 121 deletions
diff --git a/cmds/bugreportz/Android.bp b/cmds/bugreportz/Android.bp new file mode 100644 index 0000000000..924a3a351b --- /dev/null +++ b/cmds/bugreportz/Android.bp @@ -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", + ], +} diff --git a/cmds/bugreportz/Android.mk b/cmds/bugreportz/Android.mk deleted file mode 100644 index 10dda56b75..0000000000 --- a/cmds/bugreportz/Android.mk +++ /dev/null @@ -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) diff --git a/cmds/cmd/Android.bp b/cmds/cmd/Android.bp new file mode 100644 index 0000000000..d91184a201 --- /dev/null +++ b/cmds/cmd/Android.bp @@ -0,0 +1,18 @@ +cc_binary { + name: "cmd", + + srcs: ["cmd.cpp"], + + shared_libs: [ + "libutils", + "liblog", + "libselinux", + "libbinder", + ], + + cflags: [ + "-Wall", + "-Werror", + "-DXP_UNIX", + ], +} diff --git a/cmds/cmd/Android.mk b/cmds/cmd/Android.mk deleted file mode 100644 index 4868555b34..0000000000 --- a/cmds/cmd/Android.mk +++ /dev/null @@ -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) diff --git a/services/vr/performanced/Android.bp b/services/vr/performanced/Android.bp new file mode 100644 index 0000000000..20301f6ebe --- /dev/null +++ b/services/vr/performanced/Android.bp @@ -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"], +} diff --git a/services/vr/performanced/Android.mk b/services/vr/performanced/Android.mk deleted file mode 100644 index a548ef0fac..0000000000 --- a/services/vr/performanced/Android.mk +++ /dev/null @@ -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) |