Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-04 20:46:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

change name of variant -- it's not the main one anymore

Browse source
This commit is contained in:
Eric House 2019-03-10 19:25:57 -07:00
parent 62c0292045
commit be2ba7388d
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/app/build.gradle
View file

@ -75,7 +75,7 @@ android {
buildConfigField "boolean", "LOG_LIFECYLE", "false" buildConfigField "boolean", "LOG_LIFECYLE", "false"
} }
xw4 { xw4NoSMS {
dimension "variant" dimension "variant"
applicationId "org.eehouse.android.xw4" applicationId "org.eehouse.android.xw4"
manifestPlaceholders = [ APP_ID: applicationId ] manifestPlaceholders = [ APP_ID: applicationId ]
@ -194,12 +194,12 @@ android {
// directories here. AS doesn't respect what's set here: it'll // directories here. AS doesn't respect what's set here: it'll
// compile, but post-install app launch and source-level // compile, but post-install app launch and source-level
// debugging don't work. // debugging don't work.
xw4 { xw4NoSMS {
release { release {
jniLibs.srcDir "../libs-xw4Release" jniLibs.srcDir "../libs-xw4NoSMSRelease"
} }
debug { debug {
jniLibs.srcDir "../libs-xw4Debug" jniLibs.srcDir "../libs-xw4NoSMSDebug"
} }
} }
xw4d { xw4d {

0
xwords4/android/app/src/xw4/google-services.json → xwords4/android/app/src/xw4NoSMS/google-services.json
View file

0
xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/CrashTrack.java → xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/CrashTrack.java
View file

0
xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java → xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
View file

2
xwords4/android/jni/andutils.c
View file

@ -754,7 +754,7 @@ android_debugf( const char* format, ... )
} }
(void)__android_log_write( ANDROID_LOG_DEBUG, (void)__android_log_write( ANDROID_LOG_DEBUG,
# if defined VARIANT_xw4 || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS # if defined VARIANT_xw4NoSMS || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
"xw4" "xw4"
# elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS # elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS
"x4bg" "x4bg"

2
xwords4/android/jni/xwjni.c
View file

@ -691,7 +691,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID
jstring jstr = jstring jstr =
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
(*env)->NewStringUTF( env, (*env)->NewStringUTF( env,
# if defined VARIANT_xw4 || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS # if defined VARIANT_xw4NoSMS || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
XW_BT_UUID XW_BT_UUID
# elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS # elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS
XW_BT_UUID_DBG XW_BT_UUID_DBG