diff options
| author | Ying Wang <wangying@android.com> | 2016-01-12 17:34:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-12 17:34:26 +0000 |
| commit | 5799af6563c2da0a3730f1d4e007052c429ccaf8 (patch) | |
| tree | 72f6d7585be480f1ce6dcb0bf91defc3623e88f0 | |
| parent | 4203ee20f13b1dd3ec9100f5045c19541f70da33 (diff) | |
| parent | a8f28ff859c4754496ba48ba94b3cf691c5dbffe (diff) | |
| download | build-5799af6563c2da0a3730f1d4e007052c429ccaf8.tar.gz | |
Merge "Move "include configure_local_jack.mk""
| -rw-r--r-- | core/static_java_library.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 9b7b46a4a3..d9561246b9 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) |