diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:52:07 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:52:07 -0700 |
| commit | 5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1 (patch) | |
| tree | 875154ce996241e62df0722a82a724829e9daf5b /core/base_rules.mk | |
| parent | cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56 (diff) | |
| parent | 2213aab8b9043d939752baa61910f970338a1e6b (diff) | |
| download | build-5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1.zip build-5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1.tar.gz build-5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1.tar.bz2 | |
Manual merge
Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index f1a2f73..4126547 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -65,7 +65,7 @@ endif # Only the tags mentioned in this test are expected to be set by module # makefiles. Anything else is either a typo or a source of unexpected # behaviors. -ifneq ($(filter-out user debug eng tests optional samples,$(LOCAL_MODULE_TAGS)),) +ifneq ($(filter-out user debug eng tests optional samples shell_ash shell_mksh,$(LOCAL_MODULE_TAGS)),) $(warning unusual tags $(LOCAL_MODULE_TAGS) on $(LOCAL_MODULE) at $(LOCAL_PATH)) endif |