diff options
| author | Ying Wang <wangying@google.com> | 2014-09-30 00:18:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-30 00:18:54 +0000 |
| commit | 326363b82368efe5a99df558588d5b2f802fe604 (patch) | |
| tree | 1cc2922536ec9f1f8b36221d8dcec12e911698e7 /core | |
| parent | 8d8560026a75aaa9e4abe7190a1dab3c4732767d (diff) | |
| parent | 826056243415f88c3cb4a308b3158f91c06c0686 (diff) | |
| download | build-326363b82368efe5a99df558588d5b2f802fe604.zip build-326363b82368efe5a99df558588d5b2f802fe604.tar.gz build-326363b82368efe5a99df558588d5b2f802fe604.tar.bz2 | |
Merge "java_alternative_checked_module takes precedence."
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 3e21c5e..6ab59f3 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -553,14 +553,12 @@ endif # !LOCAL_UNINSTALLABLE_MODULE ## CHECK_BUILD goals ########################################################### my_checked_module := -ifdef java_alternative_checked_module - my_checked_module := $(java_alternative_checked_module) -endif - # If nobody has defined a more specific module for the # checked modules, use LOCAL_BUILT_MODULE. ifdef LOCAL_CHECKED_MODULE my_checked_module := $(LOCAL_CHECKED_MODULE) +else ifdef java_alternative_checked_module + my_checked_module := $(java_alternative_checked_module) else my_checked_module := $(LOCAL_BUILT_MODULE) endif |