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 | |
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
-rw-r--r-- | app-launcher/Android.bp | 14 | ||||
-rw-r--r-- | app-launcher/Android.mk | 10 | ||||
-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 | ||||
-rw-r--r-- | f2fs_utils/Android.bp | 4 | ||||
-rw-r--r-- | ioblame/Android.bp | 5 | ||||
-rw-r--r-- | ioblame/Android.mk | 5 | ||||
-rw-r--r-- | postinst/Android.bp | 20 | ||||
-rw-r--r-- | postinst/Android.mk | 24 | ||||
-rw-r--r-- | squashfs_utils/Android.bp | 11 | ||||
-rw-r--r-- | squashfs_utils/Android.mk | 14 | ||||
-rw-r--r-- | verity/Android.bp | 20 | ||||
-rw-r--r-- | verity/Android.mk | 27 |
16 files changed, 160 insertions, 208 deletions
diff --git a/app-launcher/Android.bp b/app-launcher/Android.bp index 7585607e..bf7b2798 100644 --- a/app-launcher/Android.bp +++ b/app-launcher/Android.bp @@ -24,3 +24,17 @@ cc_binary_host { defaults: ["computestats-defaults"], srcs: ["computestatsf.c"], } + +sh_binary_host { + name: "app-launcher", + src: "app-launcher", + required: [ + "computestats", + "computestatsf", + ], + target: { + darwin: { + enabled: false, + }, + }, +} diff --git a/app-launcher/Android.mk b/app-launcher/Android.mk deleted file mode 100644 index 5df6eb9e..00000000 --- a/app-launcher/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := app-launcher -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := app-launcher -LOCAL_MODULE_HOST_OS := linux -LOCAL_REQUIRED_MODULES := computestats computestatsf -include $(BUILD_PREBUILT) 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) diff --git a/f2fs_utils/Android.bp b/f2fs_utils/Android.bp index f673ecae..c3d3995c 100644 --- a/f2fs_utils/Android.bp +++ b/f2fs_utils/Android.bp @@ -36,10 +36,10 @@ cc_binary { ], } -cc_prebuilt_binary { +sh_binary { name: "mkf2fsuserimg.sh", - srcs: ["mkf2fsuserimg.sh"], + src: "mkf2fsuserimg.sh", required: ["make_f2fs", "sload_f2fs"], host_supported: true, } diff --git a/ioblame/Android.bp b/ioblame/Android.bp new file mode 100644 index 00000000..4b0fa711 --- /dev/null +++ b/ioblame/Android.bp @@ -0,0 +1,5 @@ +sh_binary_host { + name: "ioblame", + src: "ioblame.sh", + filename_from_src: true, +} diff --git a/ioblame/Android.mk b/ioblame/Android.mk deleted file mode 100644 index 9f981b04..00000000 --- a/ioblame/Android.mk +++ /dev/null @@ -1,5 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_PREBUILT_EXECUTABLES := ioblame.sh -include $(BUILD_HOST_PREBUILT) diff --git a/postinst/Android.bp b/postinst/Android.bp new file mode 100644 index 00000000..25e9dfe4 --- /dev/null +++ b/postinst/Android.bp @@ -0,0 +1,20 @@ +// +// Copyright (C) 2015 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. +// + +sh_binary { + name: "postinst_example", + src: "postinst.sh", +} diff --git a/postinst/Android.mk b/postinst/Android.mk deleted file mode 100644 index c804cfca..00000000 --- a/postinst/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2015 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_MODULE:= postinst_example -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := postinst.sh -include $(BUILD_PREBUILT) diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp index d09dad6e..350ed888 100644 --- a/squashfs_utils/Android.bp +++ b/squashfs_utils/Android.bp @@ -17,8 +17,17 @@ cc_library { target: { host: { - cflags: ["-Wall", "-Werror", "-D_GNU_SOURCE", "-DSQUASHFS_NO_KLOG"] + cflags: [ + "-Wall", + "-Werror", + "-D_GNU_SOURCE", + "-DSQUASHFS_NO_KLOG", + ], }, }, +} +sh_binary_host { + name: "mksquashfsimage.sh", + src: "mksquashfsimage.sh", } diff --git a/squashfs_utils/Android.mk b/squashfs_utils/Android.mk deleted file mode 100644 index bf60cf4c..00000000 --- a/squashfs_utils/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2015 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := mksquashfsimage.sh -LOCAL_SRC_FILES := mksquashfsimage.sh -LOCAL_MODULE_CLASS := EXECUTABLES -# We don't need any additional suffix. -LOCAL_MODULE_SUFFIX := -LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES)) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_HOST_OS := linux darwin -include $(BUILD_PREBUILT) diff --git a/verity/Android.bp b/verity/Android.bp index f0460db2..550b800b 100644 --- a/verity/Android.bp +++ b/verity/Android.bp @@ -130,3 +130,23 @@ cc_test { "libverity_tree", ], } + +// VeritySigner should probably just be a java_binary +sh_binary_host { + name: "verity_signer", + src: "verity_signer", + required: ["VeritySigner"], +} + +// BootSignature should probably just be a java_binary +sh_binary_host { + name: "boot_signer", + src: "boot_signer", + required: ["BootSignature"], +} + +// This should probably be a python_binary_host +sh_binary_host { + name: "build_verity_metadata.py", + src: "build_verity_metadata.py", +} diff --git a/verity/Android.mk b/verity/Android.mk deleted file mode 100644 index 4cf136a0..00000000 --- a/verity/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := verity_signer -LOCAL_MODULE := verity_signer -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := VeritySigner -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := boot_signer -LOCAL_MODULE := boot_signer -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := BootSignature -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := build_verity_metadata.py -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := build_verity_metadata.py -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) |