From cfaf1bffea88307b7375dc66673d7eb662cfcb70 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Mon, 8 Sep 2014 14:48:26 +0200
Subject: [PATCH] [DO NOT MERGE] Compile using Jack

Declare target to allow compilation to Jack files.

This includes cherry-picks of the following changes:
83efd5e421870602f3da5c8fa82a606687bfcc27
491a3adb8de2f19fbeed86dd5331f970c3377d7b

Change-Id: Ia1bb627debb87c413ab2a184bd50d8510fd5cd45
---
 build/build_android_stubs.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk
index a028900a1..f74d23c0f 100644
--- a/build/build_android_stubs.mk
+++ b/build/build_android_stubs.mk
@@ -19,6 +19,7 @@
 # resource files here.
 intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates
 full_target := $(intermediates)/classes.jar
+jack_lib := $(intermediates)/classes.jack
 src_dir := $(intermediates)/src
 classes_dir := $(intermediates)/classes
 framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
@@ -49,3 +50,6 @@ $(full_target): $(stub_timestamp) $(framework_res_package)
 	$(hide) mkdir -p $(dir $@)
 	$(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
 	$(hide) jar -u0f $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc
+
+$(jack_lib) : $(full_target) $(JILL_JAR) $(JACK_JAR)
+	$(transform-jar-to-jack)
\ No newline at end of file