commit 826056243415f88c3cb4a308b3158f91c06c0686
author Ying Wang <wangying@google.com> Mon Sep 29 17:10:34 2014 -0700
committer Ying Wang <wangying@google.com> Mon Sep 29 17:17:00 2014 -0700
tree 1cc2922536ec9f1f8b36221d8dcec12e911698e7
parent 8d8560026a75aaa9e4abe7190a1dab3c4732767d

java_alternative_checked_module takes precedence.

java_alternative_checked_module takes precedence over
LOCAL_BUILT_MODULE.

Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146

core/base_rules.mk

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 @@
 ## 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