Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Makes the android studio manifest merger not require the use of a tools:replace="android:icon" #243

Open
wants to merge 1 commit into
base: indigo
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions android_10/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:icon="@mipmap/icon"
android:label="@string/app_name">
<application>
<activity
android:name="org.ros.android.MasterChooser"
android:label="@string/app_name"
Expand Down