diff options
| author | Ying Wang <wangying@google.com> | 2014-09-30 04:17:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 04:17:12 +0000 |
| commit | dc050b7b98b53fe6598638e5e69899f4e5a9ebc3 (patch) | |
| tree | 664582ec6de71e238a8c92c10f2254bd864020de /core/base_rules.mk | |
| parent | e4cd584e1bdb0f8c8530ad5665f5a0d8871b23d8 (diff) | |
| parent | a953de3f01b3c3428e133b14bad0662b4adc901d (diff) | |
| download | build-dc050b7b98b53fe6598638e5e69899f4e5a9ebc3.zip build-dc050b7b98b53fe6598638e5e69899f4e5a9ebc3.tar.gz build-dc050b7b98b53fe6598638e5e69899f4e5a9ebc3.tar.bz2 | |
am a953de3f: am 326363b8: Merge "java_alternative_checked_module takes precedence."
* commit 'a953de3f01b3c3428e133b14bad0662b4adc901d':
java_alternative_checked_module takes precedence.
Diffstat (limited to 'core/base_rules.mk')
| -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 298c72e..46a974a 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -563,14 +563,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 |