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

Commit a1d82ef1 authored by Yohann Roussel's avatar Yohann Roussel Committed by android-build-merger
Browse files

Merge "Allow to force min sdk given to Jack" am: 6f4f2a77 

am: bd65cc38

* commit 'bd65cc38':
  Allow to force min sdk given to Jack

Change-Id: I55b673b0bb52e4f6f3d4265279528e353a157550
parents 6d061434 bd65cc38

core/clear_vars.mk

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