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

Commit f3aa0166 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Add minSdkVersion to default manifests" 

am: bd842d0b

Change-Id: I42a79f0a41fa8a3822cc1b0ab7cc4037a68e09ba
parents df267c25 bd842d0b

core/definitions.mk

+4 −2
Original line number Diff line number Diff line
@@ -2150,11 +2150,13 @@ endef 
define _create-default-manifest-file

$(1):

	rm -f $1

	echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="missing.manifest"></manifest>' > $1

	(echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="missing.manifest">' && \

	 echo '    <uses-sdk android:minSdkVersion="$(2)" />' && \

	 echo '</manifest>' ) > $1

endef



define create-default-manifest-file

  $(eval $(call _create-default-manifest-file,$(1)))

  $(eval $(call _create-default-manifest-file,$(1),$(2)))

endef

core/force_aapt2.mk

+9 −1
Original line number Diff line number Diff line
@@ -49,7 +49,15 @@ ifeq ($(FORCE_AAPT2),true) 
        # work around missing manifests by creating a default one

        $(call pretty-warning, Missing manifest file)

        LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml

        $(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))

        ifdef LOCAL_MIN_SDK_VERSION

          my_manifest_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)

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

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

        else

          my_manifest_min_sdk_version := $(DEFAULT_APP_TARGET_SDK)

        endif

        $(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE),$(my_manifest_min_sdk_version))

        my_manifest_min_sdk_version :=

      endif

    endif

  endif