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

Commit fedcf869 authored by Colin Cross's avatar Colin Cross
Browse files

Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest 

full_android_manifest may or may not be equal to
fixed_android_manifest, set PRIVATE_MIN_SDK_VERSION on
fixed_android_manifest instead.

Test: m checkbuild
Change-Id: I21795317a1334ebed772e781aeefba87392a8478
parent be2ae162

core/android_manifest.mk

+8 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ endif 


full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml



ifdef LOCAL_MIN_SDK_VERSION

  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(LOCAL_MIN_SDK_VERSION)

else ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))

  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))

else

  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)

endif



ifneq (,$(strip $(my_full_libs_manifest_files)))

  # Set up rules to merge library manifest files

  fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed
@@ -54,6 +46,14 @@ else 
  fixed_android_manifest := $(full_android_manifest)

endif



ifdef LOCAL_MIN_SDK_VERSION

  $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(LOCAL_MIN_SDK_VERSION)

else ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))

  $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))

else

  $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)

endif



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

$(fixed_android_manifest): PRIVATE_EXPORTED_SDK_LIBS_FILE := $(my_exported_sdk_libs_file)

$(fixed_android_manifest): $(my_exported_sdk_libs_file)