From ff311dd893f66b873ee00d5ca176ff3ab2e0fa53 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 14 Jun 2018 15:23:21 -0700 Subject: [PATCH] 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 --- tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk | 1 + tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk index 021185f8448b5..c723d905db5b2 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk @@ -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 diff --git a/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk index 39bd481a07148..90a7f627e591d 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk @@ -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