ec900bba20
This reverts commit 152d2d4234.
Fixed build error, and also fixed memory leak spotted from warning.
(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)
Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
42 lines
1,010 B
Makefile
42 lines
1,010 B
Makefile
# Copyright 2011 The Android Open Source Project
|
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.c fs_mgr_fstab.c
|
|
|
|
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
|
|
|
|
LOCAL_MODULE:= libfs_mgr
|
|
LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static
|
|
LOCAL_C_INCLUDES += system/extras/ext4_utils
|
|
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
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= fs_mgr_main.c
|
|
|
|
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
|
|
|
|
LOCAL_MODULE:= fs_mgr
|
|
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
|
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
|
|
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
|
|
|
|
LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static
|
|
|
|
LOCAL_CFLAGS := -Werror
|
|
|
|
include $(BUILD_EXECUTABLE)
|
|
|