diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-06-19 13:59:54 +0200 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-06-19 13:59:54 +0200 |
| commit | 5d73170c108de774c2b03658e3cee45b35f11f3f (patch) | |
| tree | 6fa910319934ced502b8a060eefdece2d3ebc352 | |
| parent | 619264970dabf24c9e004b43aca64c3a3f48eb6e (diff) | |
| download | toolchain_jack-5d73170c108de774c2b03658e3cee45b35f11f3f.zip toolchain_jack-5d73170c108de774c2b03658e3cee45b35f11f3f.tar.gz toolchain_jack-5d73170c108de774c2b03658e3cee45b35f11f3f.tar.bz2 | |
Fix bug with dependency of Jack on core-stubs-mini
mm test-jack cas broken because the dependency was not done.
Change-Id: I123ea3718c4132091037d04996a5cbdc16b64aea
| -rw-r--r-- | core-stubs-mini/Android.mk | 10 | ||||
| -rw-r--r-- | jack/Android.mk | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/core-stubs-mini/Android.mk b/core-stubs-mini/Android.mk index c235dbf..99cd8db 100644 --- a/core-stubs-mini/Android.mk +++ b/core-stubs-mini/Android.mk @@ -15,7 +15,7 @@ LOCAL_PATH := $(call my-dir) # -# core-stubs-mini-jack library +# core-stubs-mini library # include $(CLEAR_VARS) @@ -23,6 +23,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= core-stubs-mini -LOCAL_MODULE_PATH := $(LOCAL_PATH)/../jack/libs -include $(BUILD_JAVA_LIBRARY)
\ No newline at end of file +include $(BUILD_JAVA_LIBRARY) +$(LOCAL_BUILT_MODULE):PRIVATE_DEST:=$(LOCAL_PATH) +$(LOCAL_BUILT_MODULE):PRIVATE_CLASSES_JAR:=$(full_classes_jar) +$(LOCAL_BUILT_MODULE): + mkdir -p $(dir $(PRIVATE_DEST)/../jack/libs/) + cp $(PRIVATE_CLASSES_JAR) $(PRIVATE_DEST)/../jack/libs/core-stubs-mini.jar diff --git a/jack/Android.mk b/jack/Android.mk index 57d7a15..174926a 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -119,6 +119,7 @@ LOCAL_JAVA_LIBRARIES := \ $(TEST_STATIC_JAVA_LIBRARIES) LOCAL_REQUIRED_MODULES:= \ + core-stubs-mini \ core \ bouncycastle \ ext \ |