Merge "Convert to Android.bp" (65631cf0) · Commits · e / os / android_build

tools/atree/Android.bp

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		// 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"],
		}

tools/atree/Android.mk

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		# 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)

tools/fs_config/Android.bp

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		// 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"],
		}

tools/fs_config/Android.mk

+0 −42

Original line number	Diff line number	Diff line
		@@ -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)

tools/fs_get_stats/Android.bp

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		cc_binary_host {
		name: "fs_get_stats",
		srcs: ["fs_get_stats.c"],
		shared_libs: [
		"libcutils",
		"liblog",
		],
		}