Skip to content

Commit 047e4af

Browse files
committed
Move values from build variants and added them to default config. Add SDL_ to APP_ID and APP_NAME
1 parent f866ee5 commit 047e4af

1 file changed

Lines changed: 6 additions & 49 deletions

File tree

android/hello_sdl_android/build.gradle

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ android {
88
targetSdkVersion 33
99
versionCode 1
1010
versionName "1.0"
11+
resValue "string", "app_name", "Hello Sdl Android"
1112
buildConfigField 'String', 'APP_TYPE', '"DEFAULT"'
1213
buildConfigField 'String', 'REQUIRE_AUDIO_OUTPUT', '"FALSE"'
14+
buildConfigField 'String', 'SDL_APP_NAME', '"Hello Sdl"'
15+
buildConfigField 'String', 'SDL_APP_ID', '"8678309"'
16+
manifestPlaceholders = [
17+
appIcon: "@mipmap/ic_launcher"
18+
]
1319
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1420
}
1521
buildTypes {
@@ -21,83 +27,34 @@ android {
2127
flavorDimensions "default"
2228
productFlavors {
2329
multi_sec_high {
24-
applicationId "com.sdl.hellosdlandroid"
25-
resValue "string", "app_name", "Hello Sdl Android"
26-
manifestPlaceholders = [
27-
appIcon: "@mipmap/ic_launcher"
28-
]
2930
buildConfigField 'String', 'TRANSPORT', '"MULTI"'
3031
buildConfigField 'String', 'SECURITY', '"HIGH"'
31-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
32-
buildConfigField 'String', 'APP_ID', '"8678309"'
3332
}
3433
multi_sec_med {
35-
applicationId "com.sdl.hellosdlandroid"
36-
resValue "string", "app_name", "Hello Sdl Android"
37-
manifestPlaceholders = [
38-
appIcon: "@mipmap/ic_launcher"
39-
]
4034
buildConfigField 'String', 'TRANSPORT', '"MULTI"'
4135
buildConfigField 'String', 'SECURITY', '"MED"'
42-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
43-
buildConfigField 'String', 'APP_ID', '"8678309"'
4436
}
4537
multi_sec_low {
46-
applicationId "com.sdl.hellosdlandroid"
47-
resValue "string", "app_name", "Hello Sdl Android"
48-
manifestPlaceholders = [
49-
appIcon: "@mipmap/ic_launcher"
50-
]
5138
buildConfigField 'String', 'TRANSPORT', '"MULTI"'
5239
buildConfigField 'String', 'SECURITY', '"LOW"'
53-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
54-
buildConfigField 'String', 'APP_ID', '"8678309"'
5540
}
5641
multi_sec_off {
57-
applicationId "com.sdl.hellosdlandroid"
58-
resValue "string", "app_name", "Hello Sdl Android"
59-
manifestPlaceholders = [
60-
appIcon: "@mipmap/ic_launcher"
61-
]
6242
buildConfigField 'String', 'TRANSPORT', '"MULTI"'
6343
buildConfigField 'String', 'SECURITY', '"OFF"'
64-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
65-
buildConfigField 'String', 'APP_ID', '"8678309"'
6644
}
6745
multi_high_bandwidth {
68-
applicationId "com.sdl.hellosdlandroid"
69-
resValue "string", "app_name", "Hello Sdl Android"
70-
manifestPlaceholders = [
71-
appIcon: "@mipmap/ic_launcher"
72-
]
7346
buildConfigField 'String', 'TRANSPORT', '"MULTI_HB"'
7447
buildConfigField 'String', 'SECURITY', '"OFF"'
75-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
76-
buildConfigField 'String', 'APP_ID', '"8678309"'
7748
}
7849
tcp {
79-
applicationId "com.sdl.hellosdlandroid"
80-
resValue "string", "app_name", "Hello Sdl Android"
81-
manifestPlaceholders = [
82-
appIcon: "@mipmap/ic_launcher"
83-
]
8450
buildConfigField 'String', 'TRANSPORT', '"TCP"'
8551
buildConfigField 'String', 'SECURITY', '"OFF"'
86-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
87-
buildConfigField 'String', 'APP_ID', '"8678309"'
8852
}
8953
requiresAudioOutput {
90-
applicationId "com.sdl.hellosdlandroid"
91-
resValue "string", "app_name", "Hello Sdl Android"
92-
manifestPlaceholders = [
93-
appIcon: "@mipmap/ic_launcher"
94-
]
9554
buildConfigField 'String', 'TRANSPORT', '"MULTI"'
9655
buildConfigField 'String', 'SECURITY', '"OFF"'
9756
buildConfigField 'String', 'APP_TYPE', '"MEDIA"'
9857
buildConfigField 'String', 'REQUIRE_AUDIO_OUTPUT', '"TRUE"'
99-
buildConfigField 'String', 'APP_NAME', '"Hello Sdl"'
100-
buildConfigField 'String', 'APP_ID', '"8678309"'
10158
}
10259
}
10360
lintOptions {

0 commit comments

Comments
 (0)