Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'debug-build-alongside-beta' into 'master'

Browse Source 
Make debug builds installable alongside official beta build

See merge request !582
This commit is contained in:
akwizgran
2017-08-02 16:54:25 +00:00
parent 3197dcf9b5 08ce6a7331
commit a4118b40e1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/build.gradle
View File

@@ -82,11 +82,15 @@ android {
versionName "0.16.8" versionName "0.16.8"
applicationId "org.briarproject.briar.beta" applicationId "org.briarproject.briar.beta"
resValue "string", "app_package", "org.briarproject.briar.beta" resValue "string", "app_package", "org.briarproject.briar.beta"
resValue "string", "app_name", "Briar Beta"
buildConfigField "String", "GitHash", "\"${getGitHash()}\"" buildConfigField "String", "GitHash", "\"${getGitHash()}\""
} }
buildTypes { buildTypes {
debug { debug {
applicationIdSuffix ".debug"
resValue "string", "app_package", "org.briarproject.briar.beta.debug"
resValue "string", "app_name", "Briar Debug"
shrinkResources false shrinkResources false
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

1
briar-android/src/main/res/values/strings.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string translatable="false" name="app_name">Briar Beta</string>
<!-- Setup --> <!-- Setup -->
<string name="setup_title">Briar Setup</string> <string name="setup_title">Briar Setup</string>