java_alternative_checked_module takes precedence.

java_alternative_checked_module takes precedence over
LOCAL_BUILT_MODULE.

Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146
This commit is contained in:
Ying Wang 2014-09-29 17:10:34 -07:00
parent 8d8560026a
commit 8260562434
1 changed files with 2 additions and 4 deletions

View File

@ -553,14 +553,12 @@ endif # !LOCAL_UNINSTALLABLE_MODULE
## CHECK_BUILD goals ## CHECK_BUILD goals
########################################################### ###########################################################
my_checked_module := 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 # If nobody has defined a more specific module for the
# checked modules, use LOCAL_BUILT_MODULE. # checked modules, use LOCAL_BUILT_MODULE.
ifdef LOCAL_CHECKED_MODULE ifdef LOCAL_CHECKED_MODULE
my_checked_module := $(LOCAL_CHECKED_MODULE) my_checked_module := $(LOCAL_CHECKED_MODULE)
else ifdef java_alternative_checked_module
my_checked_module := $(java_alternative_checked_module)
else else
my_checked_module := $(LOCAL_BUILT_MODULE) my_checked_module := $(LOCAL_BUILT_MODULE)
endif endif