diff --git a/tools/atree/Android.bp b/tools/atree/Android.bp new file mode 100644 index 0000000000..3c3a8ef3ab --- /dev/null +++ b/tools/atree/Android.bp @@ -0,0 +1,13 @@ +// Copyright 2007 The Android Open Source Project +// +// Copies files into the directory structure described by a manifest + +cc_binary_host { + name: "atree", + srcs: [ + "atree.cpp", + "files.cpp", + "fs.cpp", + ], + static_libs: ["libhost"], +} diff --git a/tools/atree/Android.mk b/tools/atree/Android.mk deleted file mode 100644 index f598db588c..0000000000 --- a/tools/atree/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -# Copies files into the directory structure described by a manifest - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - atree.cpp \ - files.cpp \ - fs.cpp - -LOCAL_STATIC_LIBRARIES := \ - libhost - -LOCAL_MODULE := atree - -include $(BUILD_HOST_EXECUTABLE) - diff --git a/tools/fs_config/Android.bp b/tools/fs_config/Android.bp new file mode 100644 index 0000000000..797cfe228b --- /dev/null +++ b/tools/fs_config/Android.bp @@ -0,0 +1,63 @@ +// Copyright (C) 2008 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_binary_host { + name: "fs_config", + srcs: ["fs_config.c"], + shared_libs: [ + "libcutils", + "libselinux", + ], + cflags: ["-Werror"], +} + +// ----------------------------------------------------------------------------- +// Unit tests. +// ----------------------------------------------------------------------------- + +test_c_flags = [ + "-fstack-protector-all", + "-g", + "-Wall", + "-Wextra", + "-Werror", + "-fno-builtin", + "-DANDROID_FILESYSTEM_CONFIG=\"android_filesystem_config_test_data.h\"", +] + +//################################# +// test executable +cc_test_host { + name: "fs_config_generate_test", + srcs: ["fs_config_generate.c"], + shared_libs: ["libcutils"], + cflags: test_c_flags, + relative_install_path: "fs_config-unit-tests", + no_named_install_directory: true, + gtest: false, + +} + +//################################# +// gTest tool +cc_test_host { + name: "fs_config-unit-tests", + cflags: test_c_flags + ["-DHOST"], + shared_libs: [ + "liblog", + "libcutils", + "libbase", + ], + srcs: ["fs_config_test.cpp"], +} diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index ab7f92d814..3773d38523 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -14,15 +14,6 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := fs_config.c -LOCAL_MODULE := fs_config -LOCAL_SHARED_LIBRARIES := libcutils libselinux -LOCAL_CFLAGS := -Werror - -include $(BUILD_HOST_EXECUTABLE) - # One can override the default android_filesystem_config.h file in one of two ways: # # 1. The old way: @@ -306,36 +297,3 @@ my_fs_config_h := fs_config_generate_bin := my_gen_oem_aid := fs_config_generate_extra_partition_list := - -# ----------------------------------------------------------------------------- -# Unit tests. -# ----------------------------------------------------------------------------- - -test_c_flags := \ - -fstack-protector-all \ - -g \ - -Wall \ - -Wextra \ - -Werror \ - -fno-builtin \ - -DANDROID_FILESYSTEM_CONFIG='"android_filesystem_config_test_data.h"' - -################################## -# test executable -include $(CLEAR_VARS) -LOCAL_MODULE := fs_config_generate_test -LOCAL_SRC_FILES := fs_config_generate.c -LOCAL_SHARED_LIBRARIES := libcutils -LOCAL_CFLAGS := $(test_c_flags) -LOCAL_MODULE_RELATIVE_PATH := fs_config-unit-tests -LOCAL_GTEST := false -include $(BUILD_HOST_NATIVE_TEST) - -################################## -# gTest tool -include $(CLEAR_VARS) -LOCAL_MODULE := fs_config-unit-tests -LOCAL_CFLAGS += $(test_c_flags) -DHOST -LOCAL_SHARED_LIBRARIES := liblog libcutils libbase -LOCAL_SRC_FILES := fs_config_test.cpp -include $(BUILD_HOST_NATIVE_TEST) diff --git a/tools/fs_get_stats/Android.bp b/tools/fs_get_stats/Android.bp new file mode 100644 index 0000000000..6684319911 --- /dev/null +++ b/tools/fs_get_stats/Android.bp @@ -0,0 +1,8 @@ +cc_binary_host { + name: "fs_get_stats", + srcs: ["fs_get_stats.c"], + shared_libs: [ + "libcutils", + "liblog", + ], +} diff --git a/tools/fs_get_stats/Android.mk b/tools/fs_get_stats/Android.mk deleted file mode 100644 index 4501c1f20a..0000000000 --- a/tools/fs_get_stats/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := fs_get_stats.c - -LOCAL_MODULE := fs_get_stats - -LOCAL_SHARED_LIBRARIES := libcutils liblog - -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp new file mode 100644 index 0000000000..cfc6aecdf0 --- /dev/null +++ b/tools/zipalign/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright 2008 The Android Open Source Project +// +// Zip alignment tool +// + +cc_binary_host { + name: "zipalign", + + srcs: [ + "ZipAlign.cpp", + "ZipEntry.cpp", + "ZipFile.cpp", + ], + + static_libs: [ + "libandroidfw", + "libutils", + "libcutils", + "liblog", + "libzopfli", + "libz", + ], + + target: { + windows: { + host_ldlibs: ["-lpthread"], + enabled: true, + }, + }, +} diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk deleted file mode 100644 index 8c0240a27c..0000000000 --- a/tools/zipalign/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2008 The Android Open Source Project -# -# Zip alignment tool -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - ZipAlign.cpp \ - ZipEntry.cpp \ - ZipFile.cpp - -LOCAL_C_INCLUDES += external/zlib \ - external/zopfli/src - -LOCAL_STATIC_LIBRARIES := \ - libandroidfw \ - libutils \ - libcutils \ - liblog \ - libzopfli - -LOCAL_LDLIBS_linux += -lrt - -LOCAL_STATIC_LIBRARIES_windows += libz -LOCAL_LDLIBS_linux += -lz -LOCAL_LDLIBS_darwin += -lz - -ifneq ($(strip $(BUILD_HOST_static)),) -LOCAL_LDLIBS += -lpthread -endif # BUILD_HOST_static - -LOCAL_MODULE := zipalign -LOCAL_MODULE_HOST_OS := darwin linux windows - -include $(BUILD_HOST_EXECUTABLE)