From 1a9f8356fd2a895262d4de2ab32a03e4474555f9 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Wed, 13 Feb 2019 16:17:39 -0800 Subject: [PATCH] Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists This was deprecated along with TARGET_ANDROID_FILESYSTEM_CONFIG_H so warn if it still exists. Test: successful error if it exists, no error if it does not Change-Id: I7dde3c88aaf7ecec23ffe018cbe8b42ebadb2bf8 --- tools/fs_config/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index a0a91e34e..4cff846ec 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -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