From 45f05240c2d9d1f3903e2766b4883e256288f6c2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 12 Jul 2016 22:10:56 -0700 Subject: [PATCH] Convert more Android.mk files to Android.bp These modules have their dependencies satisfied, and aren't doing anything strange. Change-Id: I72039a15256cbd5e5eee0d79a15d66d74a6c087d --- adf/Android.bp | 1 + adf/Android.mk | 18 ------- adf/libadf/Android.bp | 21 ++++++++ adf/libadf/Android.mk | 24 --------- adf/libadf/tests/Android.bp | 22 ++++++++ adf/libadf/tests/Android.mk | 23 --------- adf/libadfhwc/Android.bp | 29 +++++++++++ adf/libadfhwc/Android.mk | 25 --------- libdiskconfig/Android.bp | 32 ++++++++++++ libdiskconfig/Android.mk | 29 ----------- libion/Android.bp | 25 +++++++++ libion/Android.mk | 22 -------- libion/tests/Android.bp | 36 +++++++++++++ libion/tests/Android.mk | 33 ------------ libmemtrack/Android.bp | 30 +++++++++++ libmemtrack/Android.mk | 20 -------- libnativebridge/Android.bp | 25 +++++++++ libnativebridge/Android.mk | 54 ------------------- libsparse/Android.bp | 78 ++++++++++++++++++++++++++++ libsparse/Android.mk | 100 ------------------------------------ libsuspend/Android.bp | 21 ++++++++ libsuspend/Android.mk | 33 ------------ logwrapper/Android.bp | 36 +++++++++++++ logwrapper/Android.mk | 37 ------------- reboot/Android.bp | 8 +++ reboot/Android.mk | 14 ----- tzdatacheck/Android.bp | 14 +++++ tzdatacheck/Android.mk | 21 -------- 28 files changed, 378 insertions(+), 453 deletions(-) create mode 100644 adf/Android.bp delete mode 100644 adf/Android.mk create mode 100644 adf/libadf/Android.bp delete mode 100644 adf/libadf/Android.mk create mode 100644 adf/libadf/tests/Android.bp delete mode 100644 adf/libadf/tests/Android.mk create mode 100644 adf/libadfhwc/Android.bp delete mode 100644 adf/libadfhwc/Android.mk create mode 100644 libdiskconfig/Android.bp delete mode 100644 libdiskconfig/Android.mk create mode 100644 libion/Android.bp delete mode 100644 libion/Android.mk create mode 100644 libion/tests/Android.bp delete mode 100644 libion/tests/Android.mk create mode 100644 libmemtrack/Android.bp delete mode 100644 libmemtrack/Android.mk create mode 100644 libnativebridge/Android.bp create mode 100644 libsparse/Android.bp create mode 100644 libsuspend/Android.bp delete mode 100644 libsuspend/Android.mk create mode 100644 logwrapper/Android.bp delete mode 100644 logwrapper/Android.mk create mode 100644 reboot/Android.bp delete mode 100644 reboot/Android.mk create mode 100644 tzdatacheck/Android.bp delete mode 100644 tzdatacheck/Android.mk diff --git a/adf/Android.bp b/adf/Android.bp new file mode 100644 index 000000000..b44c29601 --- /dev/null +++ b/adf/Android.bp @@ -0,0 +1 @@ +subdirs = ["*"] diff --git a/adf/Android.mk b/adf/Android.mk deleted file mode 100644 index 64d486e50..000000000 --- a/adf/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2013 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 := $(my-dir) - -include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/adf/libadf/Android.bp b/adf/libadf/Android.bp new file mode 100644 index 000000000..2b5461e3b --- /dev/null +++ b/adf/libadf/Android.bp @@ -0,0 +1,21 @@ +// Copyright (C) 2013 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_library_static { + name: "libadf", + srcs: ["adf.c"], + cflags: ["-Werror"], + local_include_dirs: ["include"], + export_include_dirs: ["include"], +} diff --git a/adf/libadf/Android.mk b/adf/libadf/Android.mk deleted file mode 100644 index 7df354bc2..000000000 --- a/adf/libadf/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013 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_SRC_FILES := adf.c -LOCAL_MODULE := libadf -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -include $(BUILD_STATIC_LIBRARY) diff --git a/adf/libadf/tests/Android.bp b/adf/libadf/tests/Android.bp new file mode 100644 index 000000000..7b333004d --- /dev/null +++ b/adf/libadf/tests/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2013 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_test { + name: "adf-unit-tests", + srcs: ["adf_test.cpp"], + static_libs: ["libadf"], + cflags: ["-Werror"], +} diff --git a/adf/libadf/tests/Android.mk b/adf/libadf/tests/Android.mk deleted file mode 100644 index 68e5817fc..000000000 --- a/adf/libadf/tests/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2013 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 := $(my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := adf_test.cpp -LOCAL_MODULE := adf-unit-tests -LOCAL_STATIC_LIBRARIES := libadf -LOCAL_CFLAGS += -Werror -include $(BUILD_NATIVE_TEST) diff --git a/adf/libadfhwc/Android.bp b/adf/libadfhwc/Android.bp new file mode 100644 index 000000000..86f0c9c21 --- /dev/null +++ b/adf/libadfhwc/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2013 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_library_static { + name: "libadfhwc", + srcs: ["adfhwc.cpp"], + static_libs: [ + "libadf", + "liblog", + "libutils", + ], + cflags: [ + "-DLOG_TAG=\\\"adfhwc\\\"", + "-Werror", + ], + local_include_dirs: ["include"], + export_include_dirs: ["include"], +} diff --git a/adf/libadfhwc/Android.mk b/adf/libadfhwc/Android.mk deleted file mode 100644 index 898f9c967..000000000 --- a/adf/libadfhwc/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2013 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_SRC_FILES := adfhwc.cpp -LOCAL_MODULE := libadfhwc -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libadf liblog libutils -LOCAL_CFLAGS += -DLOG_TAG=\"adfhwc\" -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -include $(BUILD_STATIC_LIBRARY) diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp new file mode 100644 index 000000000..041fd63b0 --- /dev/null +++ b/libdiskconfig/Android.bp @@ -0,0 +1,32 @@ +cc_library { + name: "libdiskconfig", + srcs: [ + "diskconfig.c", + "diskutils.c", + "write_lst.c", + "config_mbr.c", + ], + + shared_libs: [ + "libcutils", + "liblog", + ], + cflags: ["-Werror"], + export_include_dirs: ["include"], + local_include_dirs: ["include"], + + target: { + darwin: { + enabled: false, + }, + linux: { + cflags: [ + "-O2", + "-g", + "-W", + "-Wall", + "-D_LARGEFILE64_SOURCE", + ], + }, + }, +} diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk deleted file mode 100644 index a49ce5825..000000000 --- a/libdiskconfig/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -commonSources := \ - diskconfig.c \ - diskutils.c \ - write_lst.c \ - config_mbr.c - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(commonSources) -LOCAL_MODULE := libdiskconfig -LOCAL_MODULE_TAGS := optional -LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc -LOCAL_CFLAGS := -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -include $(BUILD_SHARED_LIBRARY) - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(commonSources) -LOCAL_MODULE := libdiskconfig_host -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -include $(BUILD_HOST_STATIC_LIBRARY) -endif # HOST_OS == linux diff --git a/libion/Android.bp b/libion/Android.bp new file mode 100644 index 000000000..da98111fc --- /dev/null +++ b/libion/Android.bp @@ -0,0 +1,25 @@ + +cc_library { + name: "libion", + srcs: ["ion.c"], + shared_libs: ["liblog"], + local_include_dirs: [ + "include", + "kernel-headers", + ], + export_include_dirs: [ + "include", + "kernel-headers", + ], + cflags: ["-Werror"], +} + +cc_binary { + name: "iontest", + srcs: ["ion_test.c"], + static_libs: ["libion"], + shared_libs: ["liblog"], + cflags: ["-Werror"], +} + +subdirs = ["tests"] diff --git a/libion/Android.mk b/libion/Android.mk deleted file mode 100644 index 6562cd3e9..000000000 --- a/libion/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := ion.c -LOCAL_MODULE := libion -LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers -LOCAL_CFLAGS := -Werror -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := ion.c ion_test.c -LOCAL_MODULE := iontest -LOCAL_MODULE_TAGS := optional tests -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CFLAGS := -Werror -include $(BUILD_EXECUTABLE) - -include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/libion/tests/Android.bp b/libion/tests/Android.bp new file mode 100644 index 000000000..4428848e1 --- /dev/null +++ b/libion/tests/Android.bp @@ -0,0 +1,36 @@ +// +// Copyright (C) 2013 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_test { + name: "ion-unit-tests", + clang: true, + cflags: [ + "-g", + "-Wall", + "-Werror", + "-Wno-missing-field-initializers", + ], + shared_libs: ["libion"], + srcs: [ + "ion_test_fixture.cpp", + "allocate_test.cpp", + "formerly_valid_handle_test.cpp", + "invalid_values_test.cpp", + "map_test.cpp", + "device_test.cpp", + "exit_test.cpp", + ], +} diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk deleted file mode 100644 index d4d07c232..000000000 --- a/libion/tests/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2013 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_CLANG := true -LOCAL_MODULE := ion-unit-tests -LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -LOCAL_SHARED_LIBRARIES += libion -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers -LOCAL_SRC_FILES := \ - ion_test_fixture.cpp \ - allocate_test.cpp \ - formerly_valid_handle_test.cpp \ - invalid_values_test.cpp \ - map_test.cpp \ - device_test.cpp \ - exit_test.cpp -include $(BUILD_NATIVE_TEST) diff --git a/libmemtrack/Android.bp b/libmemtrack/Android.bp new file mode 100644 index 000000000..98413ddcc --- /dev/null +++ b/libmemtrack/Android.bp @@ -0,0 +1,30 @@ +// Copyright 2013 The Android Open Source Project + +cc_library_shared { + name: "libmemtrack", + srcs: ["memtrack.c"], + export_include_dirs: ["include"], + local_include_dirs: ["include"], + include_dirs: ["hardware/libhardware/include"], + shared_libs: [ + "libhardware", + "liblog", + ], + cflags: [ + "-Wall", + "-Werror", + ], +} + +cc_binary { + name: "memtrack_test", + srcs: ["memtrack_test.c"], + shared_libs: [ + "libmemtrack", + "libpagemap", + ], + cflags: [ + "-Wall", + "-Werror", + ], +} diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk deleted file mode 100644 index ffc7244d3..000000000 --- a/libmemtrack/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2013 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := memtrack.c -LOCAL_MODULE := libmemtrack -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += hardware/libhardware/include -LOCAL_SHARED_LIBRARIES := libhardware liblog -LOCAL_CFLAGS := -Wall -Werror -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := memtrack_test.c -LOCAL_MODULE := memtrack_test -LOCAL_SHARED_LIBRARIES := libmemtrack libpagemap -LOCAL_CFLAGS := -Wall -Werror -include $(BUILD_EXECUTABLE) diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp new file mode 100644 index 000000000..598dfcdc9 --- /dev/null +++ b/libnativebridge/Android.bp @@ -0,0 +1,25 @@ + +cc_library { + name: "libnativebridge", + + host_supported: true, + srcs: ["native_bridge.cc"], + shared_libs: ["liblog"], + clang: true, + + cflags: [ + "-Werror", + "-Wall", + ], + cppflags: [ + "-std=gnu++11", + "-fvisibility=protected", + ], + + host_ldlibs: ["-ldl"], + target: { + android: { + shared_libs: ["libdl"], + }, + }, +} diff --git a/libnativebridge/Android.mk b/libnativebridge/Android.mk index b88621e7d..3887b1b2f 100644 --- a/libnativebridge/Android.mk +++ b/libnativebridge/Android.mk @@ -1,57 +1,3 @@ LOCAL_PATH:= $(call my-dir) -NATIVE_BRIDGE_COMMON_SRC_FILES := \ - native_bridge.cc - -# Shared library for target -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := liblog libdl -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - -# Shared library for host -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl -LOCAL_MULTILIB := both - -include $(BUILD_HOST_SHARED_LIBRARY) - -# Static library for host -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl -LOCAL_MULTILIB := both - -include $(BUILD_HOST_STATIC_LIBRARY) - - include $(LOCAL_PATH)/tests/Android.mk diff --git a/libsparse/Android.bp b/libsparse/Android.bp new file mode 100644 index 000000000..7a6ae8a54 --- /dev/null +++ b/libsparse/Android.bp @@ -0,0 +1,78 @@ +// Copyright 2010 The Android Open Source Project + +cc_defaults { + name: "libsparse_defaults", + srcs: [ + "backed_block.c", + "output_file.c", + "sparse.c", + "sparse_crc32.c", + "sparse_err.c", + "sparse_read.c", + ], + cflags: ["-Werror"], + local_include_dirs: ["include"], + export_include_dirs: ["include"], +} + +cc_library_host_static { + name: "libsparse_host", + defaults: ["libsparse_defaults"], + static_libs: ["libz"], + target: { + windows: { + enabled: true, + }, + }, +} + +cc_library_shared { + name: "libsparse", + defaults: ["libsparse_defaults"], + shared_libs: ["libz"], +} + +cc_library_static { + name: "libsparse_static", + host_supported: true, + defaults: ["libsparse_defaults"], + static_libs: ["libz"], +} + +cc_binary { + name: "simg2img", + host_supported: true, + srcs: [ + "simg2img.c", + "sparse_crc32.c", + ], + static_libs: [ + "libsparse_static", + "libz", + ], + + cflags: ["-Werror"], +} + +cc_binary { + name: "img2simg", + host_supported: true, + srcs: ["img2simg.c"], + static_libs: [ + "libsparse_static", + "libz", + ], + + cflags: ["-Werror"], +} + +cc_binary_host { + name: "append2simg", + srcs: ["append2simg.c"], + static_libs: [ + "libsparse_static", + "libz", + ], + + cflags: ["-Werror"], +} diff --git a/libsparse/Android.mk b/libsparse/Android.mk index c77eba9d6..05e68bce6 100644 --- a/libsparse/Android.mk +++ b/libsparse/Android.mk @@ -2,106 +2,6 @@ LOCAL_PATH:= $(call my-dir) -libsparse_src_files := \ - backed_block.c \ - output_file.c \ - sparse.c \ - sparse_crc32.c \ - sparse_err.c \ - sparse_read.c - - -include $(CLEAR_VARS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SRC_FILES := $(libsparse_src_files) -LOCAL_MODULE := libsparse_host -LOCAL_STATIC_LIBRARIES := libz -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -LOCAL_MODULE_HOST_OS := darwin linux windows -include $(BUILD_HOST_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SRC_FILES := $(libsparse_src_files) -LOCAL_MODULE := libsparse -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SRC_FILES := $(libsparse_src_files) -LOCAL_MODULE := libsparse_static -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libz -LOCAL_CFLAGS := -Werror -include $(BUILD_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := simg2img.c \ - sparse_crc32.c -LOCAL_MODULE := simg2img_host -# Need a unique module name, but exe should still be called simg2img -LOCAL_MODULE_STEM := simg2img -LOCAL_STATIC_LIBRARIES := \ - libsparse_host \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_HOST_EXECUTABLE) - - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := simg2img.c \ - sparse_crc32.c -LOCAL_MODULE := simg2img -LOCAL_STATIC_LIBRARIES := \ - libsparse_static \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_EXECUTABLE) - - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := img2simg.c -LOCAL_MODULE := img2simg_host -# Need a unique module name, but exe should still be called simg2img -LOCAL_MODULE_STEM := img2simg -LOCAL_STATIC_LIBRARIES := \ - libsparse_host \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_HOST_EXECUTABLE) - - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := img2simg.c -LOCAL_MODULE := img2simg -LOCAL_STATIC_LIBRARIES := \ - libsparse_static \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_EXECUTABLE) - - -ifneq ($(HOST_OS),windows) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := append2simg.c -LOCAL_MODULE := append2simg -LOCAL_STATIC_LIBRARIES := \ - libsparse_host \ - libz -LOCAL_CFLAGS := -Werror -include $(BUILD_HOST_EXECUTABLE) - -endif - include $(CLEAR_VARS) LOCAL_MODULE := simg_dump.py LOCAL_SRC_FILES := simg_dump.py diff --git a/libsuspend/Android.bp b/libsuspend/Android.bp new file mode 100644 index 000000000..d27ceea68 --- /dev/null +++ b/libsuspend/Android.bp @@ -0,0 +1,21 @@ +// Copyright 2012 The Android Open Source Project + +cc_library { + name: "libsuspend", + srcs: [ + "autosuspend.c", + "autosuspend_autosleep.c", + "autosuspend_earlysuspend.c", + "autosuspend_wakeup_count.c", + ], + export_include_dirs: ["include"], + local_include_dirs: ["include"], + shared_libs: [ + "liblog", + "libcutils", + ], + cflags: [ + "-Werror", + // "-DLOG_NDEBUG=0", + ], +} diff --git a/libsuspend/Android.mk b/libsuspend/Android.mk deleted file mode 100644 index 1ba2f59a9..000000000 --- a/libsuspend/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2012 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -libsuspend_src_files := \ - autosuspend.c \ - autosuspend_autosleep.c \ - autosuspend_earlysuspend.c \ - autosuspend_wakeup_count.c \ - -libsuspend_libraries := \ - liblog libcutils - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(libsuspend_src_files) -LOCAL_MODULE := libsuspend -LOCAL_MODULE_TAGS := optional -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := $(libsuspend_libraries) -LOCAL_CFLAGS := -Werror -#LOCAL_CFLAGS += -DLOG_NDEBUG=0 -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(libsuspend_src_files) -LOCAL_MODULE := libsuspend -LOCAL_MODULE_TAGS := optional -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -#LOCAL_CFLAGS += -DLOG_NDEBUG=0 -include $(BUILD_STATIC_LIBRARY) diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp new file mode 100644 index 000000000..41f072601 --- /dev/null +++ b/logwrapper/Android.bp @@ -0,0 +1,36 @@ + + +// ======================================================== +// Static and shared library +// ======================================================== +cc_library { + name: "liblogwrap", + srcs: ["logwrap.c"], + shared_libs: [ + "libcutils", + "liblog", + ], + export_include_dirs: ["include"], + local_include_dirs: ["include"], + cflags: [ + "-Werror", + "-std=gnu99", + ], +} + +// ======================================================== +// Executable +// ======================================================== +cc_binary { + name: "logwrapper", + srcs: ["logwrapper.c"], + static_libs: [ + "liblog", + "liblogwrap", + "libcutils", + ], + cflags: [ + "-Werror", + "-std=gnu99", + ], +} diff --git a/logwrapper/Android.mk b/logwrapper/Android.mk deleted file mode 100644 index ad45b2cee..000000000 --- a/logwrapper/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -# ======================================================== -# Static library -# ======================================================== -include $(CLEAR_VARS) -LOCAL_MODULE := liblogwrap -LOCAL_SRC_FILES := logwrap.c -LOCAL_SHARED_LIBRARIES := libcutils liblog -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -std=gnu99 -include $(BUILD_STATIC_LIBRARY) - -# ======================================================== -# Shared library -# ======================================================== -include $(CLEAR_VARS) -LOCAL_MODULE := liblogwrap -LOCAL_SHARED_LIBRARIES := libcutils liblog -LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -std=gnu99 -include $(BUILD_SHARED_LIBRARY) - -# ======================================================== -# Executable -# ======================================================== -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= logwrapper.c -LOCAL_MODULE := logwrapper -LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils -LOCAL_CFLAGS := -Werror -std=gnu99 -include $(BUILD_EXECUTABLE) diff --git a/reboot/Android.bp b/reboot/Android.bp new file mode 100644 index 000000000..805fd9a1b --- /dev/null +++ b/reboot/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2013 The Android Open Source Project + +cc_binary { + name: "reboot", + srcs: ["reboot.c"], + shared_libs: ["libcutils"], + cflags: ["-Werror"], +} diff --git a/reboot/Android.mk b/reboot/Android.mk deleted file mode 100644 index 7a24f99b6..000000000 --- a/reboot/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2013 The Android Open Source Project - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := reboot.c - -LOCAL_SHARED_LIBRARIES := libcutils - -LOCAL_MODULE := reboot - -LOCAL_CFLAGS := -Werror - -include $(BUILD_EXECUTABLE) diff --git a/tzdatacheck/Android.bp b/tzdatacheck/Android.bp new file mode 100644 index 000000000..00ad14138 --- /dev/null +++ b/tzdatacheck/Android.bp @@ -0,0 +1,14 @@ +// ======================================================== +// Executable +// ======================================================== +cc_binary { + name: "tzdatacheck", + host_supported: true, + srcs: ["tzdatacheck.cpp"], + shared_libs: [ + "libbase", + "libcutils", + "liblog", + ], + cflags: ["-Werror"], +} diff --git a/tzdatacheck/Android.mk b/tzdatacheck/Android.mk deleted file mode 100644 index 0e25f7d0a..000000000 --- a/tzdatacheck/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -# ======================================================== -# Executable -# ======================================================== -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= tzdatacheck.cpp -LOCAL_MODULE := tzdatacheck -LOCAL_SHARED_LIBRARIES := libbase libcutils liblog -LOCAL_CFLAGS := -Werror -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= tzdatacheck.cpp -LOCAL_MODULE := tzdatacheck -LOCAL_SHARED_LIBRARIES := libbase libcutils liblog -LOCAL_CFLAGS := -Werror -include $(BUILD_HOST_EXECUTABLE) -