Merge "Make not having Jack non-fatal." am: 5f88dd0dd6 am: 37a9e5d568

am: 934f9fec3d

* commit '934f9fec3d72757f4a17c0abab0daea0ef9d4cdf':
  Make not having Jack non-fatal.
This commit is contained in:
Dan Albert
2015-11-13 01:24:33 +00:00
committed by android-build-merger

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