StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move "include configure_local_jack.mk""

Browse Source
This commit is contained in:
Ying Wang
2016-01-12 17:34:26 +00:00
committed by Gerrit Code Review
parent 4203ee20f1 a8f28ff859
commit 5799af6563
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/static_java_library.mk
View File

@@ -23,6 +23,10 @@ LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_IS_STATIC_JAVA_LIBRARY := true LOCAL_IS_STATIC_JAVA_LIBRARY := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_CLASS := JAVA_LIBRARIES
#################################
include $(BUILD_SYSTEM)/configure_local_jack.mk
#################################
# Hack to build static Java library with Android resource # Hack to build static Java library with Android resource
# See bug 5714516 # See bug 5714516
all_resources := all_resources :=
@@ -59,10 +63,6 @@ endif
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
#################################
include $(BUILD_SYSTEM)/configure_local_jack.mk
#################################
ifdef LOCAL_JACK_ENABLED ifdef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_PROGUARD_FLAGS ifndef LOCAL_JACK_PROGUARD_FLAGS
LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)