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

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

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

am: 669c4d7a

Change-Id: I54eb99fde659f6c1651ae34c49d6cd81ba198e93
parents 7c963323 669c4d7a

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