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

Commit 1ea278c6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Allow codename.fingerprint format for minSdkVersion" am: 345dad3c am: a9eb75db 

Change-Id: Ia567487f314bb292ad1dfce0793f2d4c881131a1
parents 5f643479 a9eb75db

core/android_manifest.mk

+3 −1
Original line number Diff line number Diff line
@@ -42,19 +42,21 @@ else 
endif



my_target_sdk_version := $(call module-target-sdk-version)

my_min_sdk_version := $(call module-min-sdk-version)



ifdef TARGET_BUILD_APPS

  ifndef TARGET_BUILD_APPS_USE_PREBUILT_SDK

    ifeq ($(my_target_sdk_version),$(PLATFORM_VERSION_CODENAME))

      ifdef UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT

        my_target_sdk_version := $(my_target_sdk_version).$$(cat $(API_FINGERPRINT))

        my_min_sdk_version := $(my_min_sdk_version).$$(cat $(API_FINGERPRINT))

        $(fixed_android_manifest): $(API_FINGERPRINT)

      endif

    endif

  endif

endif



$(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call module-min-sdk-version)

$(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version)

$(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(my_target_sdk_version)



my_exported_sdk_libs_file := $(call local-intermediates-dir,COMMON)/exported-sdk-libs