commit 0afedd89f77f3800978adfaaf54e2b26158d5255
author Ying Wang <wangying@android.com> Wed Jan 13 18:45:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 13 18:45:01 2016 +0000
tree e95bcbb635183bd5b9dc01dee69bf6d6f9b1b28a
parent f0ebe165b94f99e32458e90aa5faa5f388eaeabc
parent 50b3d28dcc66c6af4821d9655c782365a11fe284

Merge "Move "include configure_local_jack.mk"" am: 5799af6563
am: 50b3d28dcc

* commit '50b3d28dcc66c6af4821d9655c782365a11fe284':
  Move "include configure_local_jack.mk"

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index fa65d21..c1c90d9 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -23,6 +23,10 @@
 LOCAL_IS_STATIC_JAVA_LIBRARY := true
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
+#################################
+include $(BUILD_SYSTEM)/configure_local_jack.mk
+#################################
+
 # Hack to build static Java library with Android resource
 # See bug 5714516
 all_resources :=
@@ -59,10 +63,6 @@
 
 LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
 
-#################################
-include $(BUILD_SYSTEM)/configure_local_jack.mk
-#################################
-
 ifdef LOCAL_JACK_ENABLED
 ifndef LOCAL_JACK_PROGUARD_FLAGS
     LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)