From 5150a965cbc62e0f2f60fd449b0b3d29b027679b Mon Sep 17 00:00:00 2001
From: Jean-Marie Henaff <jmhenaff@google.com>
Date: Wed, 18 Mar 2015 11:19:16 +0100
Subject: Add missing jack-api on classpath in Jill makefile

Change-Id: I0283ab74aff8b1446e17f1dc6e4edebd1c92a27a
---
 jill-api/Android.mk | 25 +++++++++++++++++++++++++
 jill/Android.mk     |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 jill-api/Android.mk

diff --git a/jill-api/Android.mk b/jill-api/Android.mk
new file mode 100644
index 0000000..ffc9596
--- /dev/null
+++ b/jill-api/Android.mk
@@ -0,0 +1,25 @@
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jill-api
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+LOCAL_JAVA_LIBRARIES := \
+  jsr305lib-jack
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/jill/Android.mk b/jill/Android.mk
index 1c0065e..5a1cea8 100644
--- a/jill/Android.mk
+++ b/jill/Android.mk
@@ -26,6 +26,7 @@ LOCAL_JAVA_RESOURCE_DIRS  := rsc
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+  jill-api \
   asm-all-4.1-jack \
   guava-jack \
   jsr305lib-jack \
@@ -49,6 +50,7 @@ LOCAL_JAVA_RESOURCE_DIRS  := rsc
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+  jill-api \
   asm-all-4.1-jack \
   guava-jack \
   jsr305lib-jack \
@@ -72,7 +74,7 @@ LOCAL_MODULE := libjillunittests
 LOCAL_MODULE_TAGS := optional
 LOCAL_JAVACFLAGS := -processor com.android.sched.build.SchedAnnotationProcessor
 
-LOCAL_STATIC_JAVA_LIBRARIES := jill
+LOCAL_STATIC_JAVA_LIBRARIES := jill jill-api
 
 LOCAL_JAVA_LIBRARIES := \
   libjackunittests \
-- 
cgit v1.1