diff options
| -rw-r--r-- | fs_mgr/Android.bp | 62 | ||||
| -rw-r--r-- | fs_mgr/Android.mk | 29 |
2 files changed, 62 insertions, 29 deletions
diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp new file mode 100644 index 000000000..0af615905 --- /dev/null +++ b/fs_mgr/Android.bp @@ -0,0 +1,62 @@ +// +// 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. +// + +cc_defaults { + name: "fs_mgr_defaults", + sanitize: { + misc_undefined: ["integer"], + }, + local_include_dirs: ["include/"], + cppflags: ["-Werror"], + static_libs: [ + "liblogwrap", + "libfec", + "libfec_rs", + "libbase", + "libcrypto_utils", + "libcrypto", + "libext4_utils", + "libsquashfs_utils", + "libselinux", + "libavb", + ], +} + +cc_library_static { + name: "libfs_mgr", + defaults: ["fs_mgr_defaults"], + export_include_dirs: ["include"], + include_dirs: ["system/vold"], + srcs: [ + "fs_mgr.cpp", + "fs_mgr_dm_ioctl.cpp", + "fs_mgr_format.cpp", + "fs_mgr_fstab.cpp", + "fs_mgr_slotselect.cpp", + "fs_mgr_verity.cpp", + "fs_mgr_avb.cpp", + "fs_mgr_avb_ops.cpp", + "fs_mgr_boot_config.cpp", + ], + product_variables: { + debuggable: { + cppflags: ["-DALLOW_ADBD_DISABLE_VERITY=1"], + }, + eng: { + cppflags: ["-DALLOW_SKIP_SECURE_CHECK=1"], + }, + }, +} diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 2863a260c..f3ca7246f 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -17,35 +17,6 @@ common_static_libraries := \ include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SANITIZE := integer -LOCAL_SRC_FILES:= \ - fs_mgr.cpp \ - fs_mgr_dm_ioctl.cpp \ - fs_mgr_format.cpp \ - fs_mgr_fstab.cpp \ - fs_mgr_slotselect.cpp \ - fs_mgr_verity.cpp \ - fs_mgr_avb.cpp \ - fs_mgr_avb_ops.cpp \ - fs_mgr_boot_config.cpp -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - system/vold \ - system/extras/ext4_utils -LOCAL_MODULE:= libfs_mgr -LOCAL_STATIC_LIBRARIES := $(common_static_libraries) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_CFLAGS := -Werror -ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT))) -LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 -endif -ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT))) -LOCAL_CFLAGS += -DALLOW_SKIP_SECURE_CHECK=1 -endif -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_CLANG := true -LOCAL_SANITIZE := integer LOCAL_SRC_FILES:= fs_mgr_main.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_MODULE:= fs_mgr |