diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-02-14 20:56:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-14 20:56:56 +0000 |
| commit | 506a796bd8729774c0ee3d7396fb9a13bc0bc36f (patch) | |
| tree | 15f472b19305a96ae7b0c09a5cc29b03d9970d9e | |
| parent | da4ee462c72b7ebeac7aaf0142986caa5fc1fc0a (diff) | |
| parent | 1a9f8356fd2a895262d4de2ab32a03e4474555f9 (diff) | |
| download | build-506a796bd8729774c0ee3d7396fb9a13bc0bc36f.tar.gz | |
Merge "Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists"
| -rw-r--r-- | tools/fs_config/Android.mk | 4 |
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 |