From e1159f5b3919e21f1969e6f819fe832644a297b4 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 30 Jan 2017 17:09:56 -0800
Subject: [PATCH] Build all the way to classes.dex for checkbuild

Test: m -j checkbuild
Change-Id: Ie1b7be01c9bbcf1a32399f19d050a93410bdb42b
---
 core/java.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java.mk b/core/java.mk
index 1437ad7bf..bfa1148e1 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -348,7 +348,11 @@ ifdef full_classes_jar
 ifdef LOCAL_JACK_ENABLED
 LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
 else
+ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
+else
+LOCAL_CHECKED_MODULE := $(built_dex)
+endif
 endif
 endif
 endif
-- 
2.11.0