Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a953de3f authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 326363b8: Merge "java_alternative_checked_module takes precedence." 

* commit '326363b8':
  java_alternative_checked_module takes precedence.
parents 1d6f150e 326363b8

core/base_rules.mk

+2 −4
Original line number Diff line number Diff line
@@ -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