[MonoAotOffsetsDumper] Remove --monodroid argument (mono#10512)

It's dead now

Author: luhenry

tools/offsets-tool/MonoAotOffsetsDumper.cs

@@ -26,11 +26,10 @@ static class MonoAotOffsetsDumper
         static string OutputDir;
         static string OutputFile;
 
-        static string MonodroidDir = @"";
-        static string AndroidNdkPath = @"";
         static string TargetDir = @"";
         static bool GenIOS;
         static bool GenAndroid;
+        static string AndroidNdkPath = @"";
 
         public enum TargetPlatform
         {
@@ -216,13 +215,7 @@ public static void Main(string[] args)
         {
             ParseCommandLineArgs(args);
 
-            string monodroidDir;
-            if (!Directory.Exists (MonodroidDir) &&
-                GetParentSubDirectoryPath ("monodroid", out monodroidDir)) {
-                MonodroidDir = Path.Combine (monodroidDir);
-            }
-
-            if (Directory.Exists (MonodroidDir) || GenAndroid)
+            if (GenAndroid)
                 SetupAndroidTargets();
 
             if (GenIOS)
@@ -270,21 +263,6 @@ static void BuildParseOptions(Driver driver, Target target)
             }
         }
 
-        static string GetAndroidNdkPath()
-        {
-            if (!String.IsNullOrEmpty (AndroidNdkPath))
-                return AndroidNdkPath;
-
-            // Find the Android NDK's path from Monodroid's config.
-            var configFile = Path.Combine(MonodroidDir, "env.config");
-            if (!File.Exists(configFile))
-                throw new Exception("Expected a valid Monodroid environment config file at " + configFile);
-
-            var config = File.ReadAllText(configFile);
-            var match = Regex.Match(config, @"ANDROID_NDK_PATH\s*:=\s(.*)");
-            return match.Groups[1].Value.Trim();
-        }
-
         static void ParseCommandLineArgs(string[] args)
         {
             var showHelp = false;
@@ -293,7 +271,6 @@ static void ParseCommandLineArgs(string[] args)
                 { "abi=", "ABI triple to generate", v => Abis.Add(v) },
                 { "o|out=", "output directory", v => OutputDir = v },
                 { "outfile=", "output directory", v => OutputFile = v },
-                { "monodroid=", "top monodroid directory", v => MonodroidDir = v },
                 { "android-ndk=", "Path to Android NDK", v => AndroidNdkPath = v },
                 { "targetdir=", "Path to the directory containing the mono build", v =>TargetDir = v },
                 { "mono=", "include directory", v => MonoDir = v },
@@ -347,14 +324,18 @@ static void SetupMono(Driver driver, Target target)
             string targetBuild;
             switch (target.Platform) {
             case TargetPlatform.Android:
-                if (TargetDir == "") {
+                if (string.IsNullOrEmpty (TargetDir)) {
                     Console.Error.WriteLine ("The --targetdir= option is required when targeting android.");
                     Environment.Exit (1);
                 }
-                if (MonoDir == "") {
+                if (string.IsNullOrEmpty (MonoDir)) {
                     Console.Error.WriteLine ("The --mono= option is required when targeting android.");
                     Environment.Exit (1);
                 }
+                if (string.IsNullOrEmpty(AndroidNdkPath)) {
+                    Console.WriteLine("The --android-ndk= option is required when targeting android");
+                    Environment.Exit (1);
+                }
                 if (Abis.Count != 1) {
                     Console.Error.WriteLine ("Exactly one --abi= argument is required when targeting android.");
                     Environment.Exit (1);
@@ -367,6 +348,10 @@ static void SetupMono(Driver driver, Target target)
                     Console.Error.WriteLine ("The --targetdir= option is required when targeting ios.");
                     Environment.Exit (1);
                 }
+                if (string.IsNullOrEmpty (MonoDir)) {
+                    Console.Error.WriteLine ("The --mono= option is required when targeting ios.");
+                    Environment.Exit (1);
+                }
                 targetBuild = TargetDir;
                 break;
             }
@@ -570,9 +555,8 @@ static void SetupXcode(Driver driver, Target target)
 
         static string GetAndroidHostToolchainPath()
         {
-            var androidNdkPath = GetAndroidNdkPath ();
             var toolchains = Directory.EnumerateDirectories(
-                Path.Combine(androidNdkPath, "toolchains"), "llvm*").ToList();
+                Path.Combine(AndroidNdkPath, "toolchains"), "llvm*").ToList();
             toolchains.Sort();
 
             var toolchainPath = toolchains.LastOrDefault();
@@ -617,10 +601,9 @@ static void SetupAndroidNDK(Driver driver, Target target)
             var builtinsPath = GetAndroidBuiltinIncludesFolder();
             parserOptions.AddSystemIncludeDirs(builtinsPath);
 
-            var androidNdkRoot = GetAndroidNdkPath ();
             const int androidNdkApiLevel = 21;
 
-            var toolchainPath = Path.Combine(androidNdkRoot, "platforms",
+            var toolchainPath = Path.Combine(AndroidNdkPath, "platforms",
                 "android-" + androidNdkApiLevel, "arch-" + GetArchFromTriple(target.Triple),
                 "usr", "include");
             parserOptions.AddSystemIncludeDirs(toolchainPath);