openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 326363b8: Merge "java_alternative_checked_module takes precedence." 

* commit '326363b82368efe5a99df558588d5b2f802fe604':
  java_alternative_checked_module takes precedence.
This commit is contained in:
Ying Wang 2014-09-30 00:24:30 +00:00 committed by Android Git Automerger
parent 1d6f150e3e 326363b823
commit a953de3f01
1 changed files with 2 additions and 4 deletions
Show Stats 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 ## 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