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

Merge "Allow to force min sdk given to Jack"

Browse Source 
am: 6f4f2a7

* commit '6f4f2a77939e8de843a9eb70e92e32c8054d74d5':
  Allow to force min sdk given to Jack

Change-Id: I029e852c82cd2fd20739b466917542211397757c
This commit is contained in:
Yohann Roussel
2016-04-14 21:33:33 +00:00
committed by android-build-merger
parent cb9847c8ab 6f4f2a7793
commit bd65cc387b
2 changed files with 5 additions and 0 deletions
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)