From: Ying Wang <wangying@google.com>
Date: Mon, 11 Jan 2016 21:34:16 +0000 (-0800)
Subject: Move "include configure_local_jack.mk"
X-Git-Tag: android-x86-7.1-r1~492^2~50^2~11^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8f28ff859c4754496ba48ba94b3cf691c5dbffe;p=android-x86%2Fbuild.git

Move "include configure_local_jack.mk"

Move "include configure_local_jack.mk" out of the scope of
"ifdef LOCAL_RESOURCE_DIR".

Change-Id: I67bbb4e6b59414559219d24136ff91ba799fda25
---

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 9b7b46a4a..d9561246b 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -23,6 +23,10 @@ LOCAL_UNINSTALLABLE_MODULE := true
 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 @@ endif
 
 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)