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

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

Fix ManifestMerger issues 

Set LOCAL_MIN_SDK_VERSION in aapt2 integration test libraries so that
the build system doesn't raise the minSdkVersion value specified in
the manifest, which causes ManifestMerger to error when trying to
merge it into a package that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: If5d4f97bb2d8a503bd3c20f2ea8aea2519c51e85
parent abdaa314

tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_MODULE := AaptTestNamespace_LibOne 
LOCAL_SDK_VERSION := current

LOCAL_MODULE_TAGS := tests

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_MIN_SDK_VERSION := 21



# We need this to retain the R.java generated for this library.

LOCAL_JAR_EXCLUDE_FILES := none

tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ LOCAL_SDK_VERSION := current 
LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_MIN_SDK_VERSION := 21



# We need this to retain the R.java generated for this library.

LOCAL_JAR_EXCLUDE_FILES := none