Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f4f2a77 authored Apr 14, 2016 by Yohann Roussel Committed by Gerrit Code Review Apr 14, 2016

Merge "Allow to force min sdk given to Jack"

parents 98f7a5c7 109141cc

core/clear_vars.mk

+1 −0

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

core/java.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,10 @@ else
		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))
		ifneq ($(proto_sources),)
		ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)