diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-18 17:24:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-18 17:24:13 +0000 |
| commit | d7793125be4b793d4e48582e6de82c2626d26e8b (patch) | |
| tree | 3c8aa03a946fc31aeeb0b37d33473f1d315dbcd6 | |
| parent | f2169c6b0e6bbf92759c3d788e96696317bffbc6 (diff) | |
| parent | 5150a965cbc62e0f2f60fd449b0b3d29b027679b (diff) | |
| download | toolchain_jill-d7793125be4b793d4e48582e6de82c2626d26e8b.zip toolchain_jill-d7793125be4b793d4e48582e6de82c2626d26e8b.tar.gz toolchain_jill-d7793125be4b793d4e48582e6de82c2626d26e8b.tar.bz2 | |
Merge "Add missing jack-api on classpath in Jill makefile" into ub-jack
| -rw-r--r-- | jill-api/Android.mk | 25 | ||||
| -rw-r--r-- | jill/Android.mk | 4 |
2 files changed, 28 insertions, 1 deletions
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 \ |