Move android.jar Check

OpenDDS · Oct 7, 2024 · 6c71540 · 6c71540
1 parent 4ce8171
commit 6c71540
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/configure.sh b/configure.sh
@@ -18,6 +18,13 @@ then
   else
     extra_configure_flags+=("--java=${jdk}")
   fi
+
+  android_jar="$android_sdk/platforms/android-$android_target_api/android.jar"
+  if [ ! -f "$android_jar" ]
+  then
+    echo "Error: $android_jar doesn't exist, check that android_sdk and android_target_api are correct" 1>&2
+    exit 1
+  fi
 fi
 
 if $use_security

diff --git a/setenv.sh b/setenv.sh
@@ -165,12 +165,6 @@ then
     echo "Error: use_java is true, but android_target_api isn't set" 1>&2
     exit 1
   fi
-  android_jar="$android_sdk/platforms/android-$android_target_api/android.jar"
-  if [ ! -f "$android_jar" ]
-  then
-    echo "Error: $android_jar doesn't exist, check that android_sdk and android_target_api are correct" 1>&2
-    exit 1
-  fi
 fi
 if $use_security
 then