aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2019-02-13 16:17:39 -0800
committerTom Cherry <tomcherry@google.com>2019-02-14 10:02:04 -0800
commit1a9f8356fd2a895262d4de2ab32a03e4474555f9 (patch)
treed8cb5c88034c41af7672171470e9bf2761de76c4
parent87ec538ef1e5c3dc8d7a1171dfe664ecdfb0ecde (diff)
downloadplatform_build-1a9f8356fd2a895262d4de2ab32a03e4474555f9.tar.gz
platform_build-1a9f8356fd2a895262d4de2ab32a03e4474555f9.tar.bz2
platform_build-1a9f8356fd2a895262d4de2ab32a03e4474555f9.zip
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
-rw-r--r--tools/fs_config/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index a0a91e34e6..4cff846ec0 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