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

Commit d6101b67 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Fix jack min sdk version for ub branches 

Bug: 27371864
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
parent 63de7774

core/java.mk

+9 −3
Original line number Diff line number Diff line
@@ -29,15 +29,21 @@ 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 ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)

        LOCAL_JAVA_LIBRARIES := android_test_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 ifeq ($(LOCAL_SDK_VERSION),test_current)

        my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)

      else

        my_jack_min_sdk_version := $(LOCAL_SDK_VERSION)

      endif

    endif