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

Commit ad84f802 authored by Sebastien Hertz's avatar Sebastien Hertz Committed by Android (Google) Code Review
Browse files

Merge "Allow to force min sdk given to Jack" into nyc-dev

parents 8fe9274a d98c4207

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)