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

Commit 109141cc authored Apr 14, 2016 by Yohann Roussel Committed by Sebastien Hertz Apr 14, 2016

Allow to force min sdk given to Jack

Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4

parent 6d41f7e1

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ LOCAL_JACK_FLAGS:=
		LOCAL_JILL_FLAGS:=
		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)