diff --git a/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java b/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java index ae200c78d0..656a27fec3 100644 --- a/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java +++ b/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java @@ -85,7 +85,6 @@ public class Monitor extends Service { // XML defined variables, populated in onCreate private String fileNameClient; - private String fileNameCLI; private String fileNameCABundle; private String fileNameClientConfig; private String fileNameGuiAuthentication; @@ -120,7 +119,6 @@ public class Monitor extends Service { // populate attributes with XML resource values boincWorkingDir = getString(R.string.client_path); fileNameClient = getString(R.string.client_name); - fileNameCLI = getString(R.string.client_cli); fileNameCABundle = getString(R.string.client_cabundle); fileNameClientConfig = getString(R.string.client_config); fileNameGuiAuthentication = getString(R.string.auth_file_name); @@ -688,10 +686,6 @@ public class Monitor extends Service { if (Logging.ERROR) Log.d(Logging.TAG, "Failed to install: " + fileNameClient); return false; } - if (!installFile(fileNameCLI, true, true, "")) { - if (Logging.ERROR) Log.d(Logging.TAG, "Failed to install: " + fileNameCLI); - return false; - } if (!installFile(fileNameCABundle, true, false, "")) { if (Logging.ERROR) Log.d(Logging.TAG, "Failed to install: " + fileNameCABundle); return false; diff --git a/android/BOINC/app/src/main/res/values/configuration.xml b/android/BOINC/app/src/main/res/values/configuration.xml index 9c59e26b1d..5ab9466c03 100644 --- a/android/BOINC/app/src/main/res/values/configuration.xml +++ b/android/BOINC/app/src/main/res/values/configuration.xml @@ -20,7 +20,6 @@ /data/data/edu.berkeley.boinc/client/ boinc - boinccmd ca-bundle.crt cc_config.xml gui_rpc_auth.cfg diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh index 42a7253b69..5b4c2b535c 100755 --- a/android/build_boinc_arm.sh +++ b/android/build_boinc_arm.sh @@ -58,7 +58,6 @@ if [ -n "$COMPILEBOINC" ]; then cd android mkdir -p "BOINC/app/src/main/assets" cp "$BOINC/stage/usr/local/bin/boinc" "BOINC/app/src/main/assets/armeabi-v7a/boinc" - cp "$BOINC/stage/usr/local/bin/boinccmd" "BOINC/app/src/main/assets/armeabi-v7a/boinccmd" cp "$BOINC/win_build/installerv2/redist/all_projects_list.xml" "BOINC/app/src/main/assets/all_projects_list.xml" cp "$BOINC/curl/ca-bundle.crt" "BOINC/app/src/main/assets/ca-bundle.crt" diff --git a/android/build_boinc_arm64.sh b/android/build_boinc_arm64.sh index 4d0702c43c..f54d361479 100755 --- a/android/build_boinc_arm64.sh +++ b/android/build_boinc_arm64.sh @@ -58,7 +58,6 @@ if [ -n "$COMPILEBOINC" ]; then cd android mkdir -p "BOINC/app/src/main/assets" cp "$BOINC/stage/usr/local/bin/boinc" "BOINC/app/src/main/assets/arm64-v8a/boinc" - cp "$BOINC/stage/usr/local/bin/boinccmd" "BOINC/app/src/main/assets/arm64-v8a/boinccmd" cp "$BOINC/win_build/installerv2/redist/all_projects_list.xml" "BOINC/app/src/main/assets/all_projects_list.xml" cp "$BOINC/curl/ca-bundle.crt" "BOINC/app/src/main/assets/ca-bundle.crt" diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh index aaf9826d2f..1ddd4aadc1 100755 --- a/android/build_boinc_x86.sh +++ b/android/build_boinc_x86.sh @@ -58,7 +58,6 @@ if [ -n "$COMPILEBOINC" ]; then cd android mkdir -p "BOINC/app/src/main/assets" cp "$BOINC/stage/usr/local/bin/boinc" "BOINC/app/src/main/assets/x86/boinc" - cp "$BOINC/stage/usr/local/bin/boinccmd" "BOINC/app/src/main/assets/x86/boinccmd" cp "$BOINC/win_build/installerv2/redist/all_projects_list.xml" "BOINC/app/src/main/assets/all_projects_list.xml" cp "$BOINC/curl/ca-bundle.crt" "BOINC/app/src/main/assets/ca-bundle.crt" diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh index a25956555f..89f0db52a2 100755 --- a/android/build_boinc_x86_64.sh +++ b/android/build_boinc_x86_64.sh @@ -58,7 +58,6 @@ if [ -n "$COMPILEBOINC" ]; then cd android mkdir -p "BOINC/app/src/main/assets" cp "$BOINC/stage/usr/local/bin/boinc" "BOINC/app/src/main/assets/x86_64/boinc" - cp "$BOINC/stage/usr/local/bin/boinccmd" "BOINC/app/src/main/assets/x86_64/boinccmd" cp "$BOINC/win_build/installerv2/redist/all_projects_list.xml" "BOINC/app/src/main/assets/all_projects_list.xml" cp "$BOINC/curl/ca-bundle.crt" "BOINC/app/src/main/assets/ca-bundle.crt"