Use tools:node="replace" instead of tools:merge="override"

tools:merge="override" is no longer supported in Manifest Merger 2.

Bug: 36005379
Test: m -j Launcher3Go
Change-Id: I289f74f35876cdf274433ec1a579875217d9b9a8
This commit is contained in:
Colin Cross
2017-09-13 17:15:59 -07:00
committed by Scott Pollom
parent 87adc3305c
commit 318a8b626f

View File

@@ -42,7 +42,7 @@
android:excludeFromRecents="true"
android:autoRemoveFromRecents="true"
android:label="@string/action_add_to_workspace"
tools:merge="override" >
tools:node="replace" >
<intent-filter>
<action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
</intent-filter>