Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ManifestMerger issues" into stage-aosp-master

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-18 20:15:00 +00:00
committed by Android (Google) Code Review
parent 0da95a5d64 ff311dd893
commit 669c4d7ae7
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
View File

@@ -23,6 +23,7 @@ LOCAL_MODULE := AaptTestNamespace_LibOne
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_MIN_SDK_VERSION := 21
# We need this to retain the R.java generated for this library. # We need this to retain the R.java generated for this library.
LOCAL_JAR_EXCLUDE_FILES := none LOCAL_JAR_EXCLUDE_FILES := none

1
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
View File

@@ -24,6 +24,7 @@ LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_MIN_SDK_VERSION := 21
# We need this to retain the R.java generated for this library. # We need this to retain the R.java generated for this library.
LOCAL_JAR_EXCLUDE_FILES := none LOCAL_JAR_EXCLUDE_FILES := none