diff options
| author | Colin Cross <ccross@android.com> | 2018-06-14 15:23:21 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-06-15 23:03:46 +0000 |
| commit | ff311dd893f66b873ee00d5ca176ff3ab2e0fa53 (patch) | |
| tree | 0322cdeb7df37ac1e0c28454bbe7495818840562 /tools/aapt2/integration-tests | |
| parent | abdaa314f885b5a889e48676b7b2b0460a5332f7 (diff) | |
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
Diffstat (limited to 'tools/aapt2/integration-tests')
| -rw-r--r-- | tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk | 1 | ||||
| -rw-r--r-- | tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk index 021185f8448b..c723d905db5b 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 39bd481a0714..90a7f627e591 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 |