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

Commit d98c4207 authored by Yohann Roussel's avatar Yohann Roussel Committed by Sebastien Hertz
Browse files

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

(cherry picked from commit 109141cc)

Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
parent 2e2c1379

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:= 
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
@@ -55,6 +55,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)