Merge "Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists"

am: 506a796bd8

Change-Id: I17a17b6184b3e0cd2ddfb43728d8cfc5014aa985
This commit is contained in:
Tom Cherry 2019-02-14 13:07:07 -08:00 committed by android-build-merger
commit 201f5e5a3c
1 changed files with 4 additions and 0 deletions

View File

@ -21,6 +21,10 @@ LOCAL_PATH := $(call my-dir)
# More information can be found in the README
ANDROID_FS_CONFIG_H := android_filesystem_config.h
ifneq ($(wildcard $(TARGET_DEVICE_DIR)/$(ANDROID_FS_CONFIG_H)),)
$(error Using $(ANDROID_FS_CONFIG_H) is deprecated, please use TARGET_FS_CONFIG_GEN instead)
endif
my_fs_config_h := $(LOCAL_PATH)/default/$(ANDROID_FS_CONFIG_H)
system_android_filesystem_config := system/core/include/private/android_filesystem_config.h