openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Allow to force min sdk given to Jack"

This commit is contained in:
Yohann Roussel 2016-04-14 21:14:38 +00:00 committed by Gerrit Code Review
parent 98f7a5c744 109141ccc9
commit 6f4f2a7793
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -115,6 +115,7 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:= LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=
LOCAL_CERTIFICATE:= LOCAL_CERTIFICATE:=
LOCAL_SDK_VERSION:= LOCAL_SDK_VERSION:=
LOCAL_MIN_SDK_VERSION:=
LOCAL_SDK_RES_VERSION:= LOCAL_SDK_RES_VERSION:=
LOCAL_NDK_STL_VARIANT:= LOCAL_NDK_STL_VARIANT:=
LOCAL_EMMA_INSTRUMENT:= LOCAL_EMMA_INSTRUMENT:=

4
core/java.mk
View File

@ -51,6 +51,10 @@ else
endif endif
endif endif
ifneq (,$(strip $(LOCAL_MIN_SDK_VERSION)))
my_jack_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
endif
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
ifneq ($(proto_sources),) ifneq ($(proto_sources),)
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)