Skip to content

Commit d0563c4

Browse files
committed
Remove package from manifest and put in build.gradle
1 parent cc45527 commit d0563c4

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

android/hello_sdl_android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ android {
6161
lintOptions {
6262
disable 'GoogleAppIndexingWarning'
6363
}
64+
namespace 'com.sdl.hellosdlandroid'
6465
}
6566

6667

android/hello_sdl_android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.sdl.hellosdlandroid">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.BLUETOOTH" />
76
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"

android/sdl_android/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ android {
3838
main.java.srcDirs += '../../base/src/main/java'
3939
androidTest.assets.srcDirs += '../../generator/rpc_spec/'
4040
}
41+
namespace 'com.smartdevicelink'
42+
testNamespace 'com.smartdevicelink.test'
4143
}
4244

4345
ext { VERSION_NAME = "$project.android.defaultConfig.versionName" }

android/sdl_android/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest package="com.smartdevicelink.test"
2-
xmlns:android="http://schemas.android.com/apk/res/android">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-sdk android:minSdkVersion="16" />
54
<uses-permission android:name="android.permission.BLUETOOTH" />
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest package="com.smartdevicelink"
2-
xmlns:tools="http://schemas.android.com/tools">
1+
<manifest xmlns:tools="http://schemas.android.com/tools">
32

43
<uses-sdk tools:overrideLibrary="android.arch.lifecycle, android.arch.lifecycle.extensions, android.arch.lifecycle.livedata, android.arch.lifecycle.livedata.core, android.arch.core, android.arch.lifecycle.viewmodel, android.support.fragment, android.support.coreui, android.support.coreutils, android.support.compat" />
54
</manifest>

0 commit comments

Comments
 (0)