Merge "Make not having Jack non-fatal."

am: 5f88dd0dd6

* commit '5f88dd0dd68356679ebdc5991c20bbbad657cc43':
  Make not having Jack non-fatal.
This commit is contained in:
Dan Albert 2015-11-13 01:18:32 +00:00 committed by android-build-merger
commit 37a9e5d568

View file

@ -316,8 +316,8 @@ include build/core/pdk_config.mk
#
# -----------------------------------------------------------------
# Jack version configuration
include $(TOPDIR)prebuilts/sdk/tools/jack_versions.mk
include $(TOPDIR)prebuilts/sdk/tools/jack_for_module.mk
-include $(TOPDIR)prebuilts/sdk/tools/jack_versions.mk
-include $(TOPDIR)prebuilts/sdk/tools/jack_for_module.mk
# -----------------------------------------------------------------
###