diff options
author | Dan Willemsen <dwillemsen@google.com> | 2019-03-28 10:37:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-28 10:37:19 -0700 |
commit | 61962565ec768372867df51c6526103cced5523a (patch) | |
tree | 55fd7550a1b09ff31e8d21aa859dc6ddaf6b54a9 /boottime_tools | |
parent | ff20d16de77dd4715fe48845b54855f28ba50739 (diff) | |
parent | 07bcf1a5c3e29564047de2b0d72b2c80cebb0176 (diff) | |
download | extras-61962565ec768372867df51c6526103cced5523a.tar.gz |
Merge "Convert more of system/extras to Android.bp" am: 0a35afacda am: 03cc6a3537
am: 07bcf1a5c3
Change-Id: Iaff58bceea0b9f344cef8422211be668803fd374
Diffstat (limited to 'boottime_tools')
-rw-r--r-- | boottime_tools/bootanalyze/Android.mk | 20 | ||||
-rw-r--r-- | boottime_tools/bootanalyze/stressfs/Android.bp | 26 | ||||
-rw-r--r-- | boottime_tools/bootanalyze/stressfs/Android.mk | 29 | ||||
-rw-r--r-- | boottime_tools/bootio/Android.bp | 63 | ||||
-rw-r--r-- | boottime_tools/bootio/Android.mk | 76 |
5 files changed, 89 insertions, 125 deletions
diff --git a/boottime_tools/bootanalyze/Android.mk b/boottime_tools/bootanalyze/Android.mk deleted file mode 100644 index 5df0dd83..00000000 --- a/boottime_tools/bootanalyze/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2017 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 the sub-makefiles -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/boottime_tools/bootanalyze/stressfs/Android.bp b/boottime_tools/bootanalyze/stressfs/Android.bp new file mode 100644 index 00000000..f342d1aa --- /dev/null +++ b/boottime_tools/bootanalyze/stressfs/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2017 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. +// +// + +android_test { + name: "StressFS", + srcs: ["src/**/*.java"], + + sdk_version: "current", + + optimize: { + proguard_flags_files: ["proguard.flags"], + }, +} diff --git a/boottime_tools/bootanalyze/stressfs/Android.mk b/boottime_tools/bootanalyze/stressfs/Android.mk deleted file mode 100644 index 2e54e64b..00000000 --- a/boottime_tools/bootanalyze/stressfs/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2017 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_PACKAGE_NAME := StressFS -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE_TAGS := tests -LOCAL_SDK_VERSION := current - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -include $(BUILD_PACKAGE) diff --git a/boottime_tools/bootio/Android.bp b/boottime_tools/bootio/Android.bp new file mode 100644 index 00000000..7c8ef269 --- /dev/null +++ b/boottime_tools/bootio/Android.bp @@ -0,0 +1,63 @@ +// +// 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: "bootio_defaults", + + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], + shared_libs: [ + "libbase", + "libcutils", + "liblog", + "libprotobuf-cpp-lite", + ], +} + +// bootio library +// ----------------------------------------------------------------------------- + +cc_library_shared { + name: "libbootio", + defaults: ["bootio_defaults"], + + include_dirs: ["system/extras/boottime_tools"], + + export_include_dirs: ["."], + proto: { + canonical_path_from_root: false, + type: "lite", + }, + srcs: [ + "protos.proto", + "bootio_collector.cpp", + ], +} + +// bootio binary +// ----------------------------------------------------------------------------- + +cc_binary { + name: "bootio", + defaults: ["bootio_defaults"], + shared_libs: ["libbootio"], + + init_rc: ["bootio.rc"], + srcs: ["bootio.cpp"], +} diff --git a/boottime_tools/bootio/Android.mk b/boottime_tools/bootio/Android.mk deleted file mode 100644 index e4db8355..00000000 --- a/boottime_tools/bootio/Android.mk +++ /dev/null @@ -1,76 +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) - -bootio_lib_src_files := \ - protos.proto \ - bootio_collector.cpp \ - -bootio_src_files := \ - bootio.cpp \ - -bootio_shared_libs := \ - libbase \ - libcutils \ - liblog \ - libprotobuf-cpp-lite \ - -bootio_cflags := \ - -Wall \ - -Werror \ - -Wextra \ - -define bootio_proto_include -$(call local-generated-sources-dir)/proto/$(LOCAL_PATH) -endef - -# bootio static library -# ----------------------------------------------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libbootio -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ - $(call bootio_proto_include) \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_CFLAGS := $(bootio_cflags) -LOCAL_SHARED_LIBRARIES := $(bootio_shared_libs) -LOCAL_PROTOC_OPTIMIZE_TYPE := lite -LOCAL_SRC_FILES := $(bootio_lib_src_files) - -include $(BUILD_SHARED_LIBRARY) - - -# bootio binary -# ----------------------------------------------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := bootio -LOCAL_CFLAGS := $(bootio_cflags) -LOCAL_SHARED_LIBRARIES := \ - $(bootio_shared_libs) \ - libbootio \ - -LOCAL_INIT_RC := bootio.rc -LOCAL_SRC_FILES := $(bootio_src_files) - -include $(BUILD_EXECUTABLE) |