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

Commit 1d09e1d8 authored by Yohann Roussel's avatar Yohann Roussel Committed by Gerrit Code Review
Browse files

Merge "Fix jack min sdk version for ub branches"

parents fd529902 22a9e788

core/java.mk

+7 −2
Original line number Diff line number Diff line
@@ -29,12 +29,17 @@ ifneq ($(LOCAL_SDK_VERSION),) 
      ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

        # Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

        LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)

        my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)

      else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)

        LOCAL_JAVA_LIBRARIES := android_system_stubs_current $(LOCAL_JAVA_LIBRARIES)

        my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)

      else

        LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

      endif



      ifeq ($(LOCAL_SDK_VERSION),current)

        my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)

      else ifeq ($(LOCAL_SDK_VERSION),system_current)

        my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)

      else

        my_jack_min_sdk_version := $(LOCAL_SDK_VERSION)

      endif

    endif