StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "java_alternative_checked_module takes precedence."

Browse Source
This commit is contained in:
Ying Wang
2014-09-30 00:18:53 +00:00
committed by Gerrit Code Review
parent 8d8560026a 8260562434
commit 326363b823
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/base_rules.mk
View File

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