refactor: switch to SDK usage on macOS by default

evm-config.schema.json

@@ -12,17 +12,6 @@
       "type": "string",
       "default": "electron"
     },
-    "preserveXcode": {
-      "description": "Preserve the N most recent Xcode versions",
-      "type": "integer",
-      "default": 5,
-      "minimum": 1
-    },
-    "onlySdk": {
-      "description": "Use macOS SDKs instead of downloading full XCode versions when necessary",
-      "type": "boolean",
-      "default": false
-    },
     "execName": {
       "description": "Name of the built executable to run",
       "type": "string",

example-configs/evm.base.yml

@@ -1,7 +1,5 @@
 root: /path/to/your/developer/folder
 reclient: remote_exec
-preserveXcode: 5
-onlySdk: false
 remotes:
   electron:
     # SSH or HTTPS url

src/e

@@ -9,7 +9,6 @@ const evmConfig = require('./evm-config');
 const { color, fatal } = require('./utils/logging');
 const depot = require('./utils/depot-tools');
 const { refreshPathVariable } = require('./utils/refresh-path');
-const { loadXcode } = require('./utils/load-xcode');
 const { ensureSDK } = require('./utils/sdk');
 
 // Refresh the PATH variable at the top of this shell so that retries in the same shell get the latest PATH variable
@@ -188,17 +187,10 @@ ci.command('rerun', 'Rerun CI workflows and builds');
 ci.command('cancel', 'Cancel CI workflows and builds');
 
 program
-  .command('load-xcode')
-  .option('--only-sdk', 'Only load the macOS SDK and not the full Xcode', false)
-  .description(
-    'Loads required versions of Xcode or macOS SDKs and symlinks them (may require sudo)',
-  )
-  .action(({ onlySdk }) => {
-    if (onlySdk) {
-      ensureSDK();
-    } else {
-      loadXcode();
-    }
+  .command('load-macos-sdk')
+  .description('Loads required versions of macOS SDKs and symlinks them (may require sudo)')
+  .action(() => {
+    ensureSDK();
   });
 
 program

src/e-build.js

@@ -10,7 +10,6 @@ const { color, fatal } = require('./utils/logging');
 const depot = require('./utils/depot-tools');
 const { ensureDir } = require('./utils/paths');
 const reclient = require('./utils/reclient');
-const { loadXcode } = require('./utils/load-xcode');
 const { ensureSDK, ensureSDKAndSymlink } = require('./utils/sdk');
 
 function getGNArgs(config) {
@@ -101,11 +100,7 @@ program
       reclient.downloadAndPrepare(config);
 
       if (process.platform === 'darwin') {
-        if (config.onlySdk) {
-          ensureSDK();
-        } else {
-          loadXcode({ quiet: true });
-        }
+        ensureSDK();
       }
 
       if (options.onlyGen) {

src/e-init.js

@@ -12,7 +12,6 @@ const { color, fatal } = require('./utils/logging');
 const { resolvePath, ensureDir } = require('./utils/paths');
 const depot = require('./utils/depot-tools');
 const { checkGlobalGitConfig } = require('./utils/git');
-const { loadXcode } = require('./utils/load-xcode');
 const { ensureSDK } = require('./utils/sdk');
 
 // https://gn.googlesource.com/gn/+/main/docs/reference.md?pli=1#var_target_cpu
@@ -68,8 +67,6 @@ function createConfig(options) {
       args: gn_args,
       out: options.out,
     },
-    preserveXcode: 5,
-    onlySdk: options.onlySdk,
     env: {
       CHROMIUM_BUILDTOOLS_PATH: path.resolve(root, 'src', 'buildtools'),
       GIT_CACHE_PATH: process.env.GIT_CACHE_PATH
@@ -139,11 +136,6 @@ program
   .option('--msan', `When building, enable clang's memory sanitizer`, false)
   .option('--lsan', `When building, enable clang's leak sanitizer`, false)
   .option('--mas', 'Build for the macOS App Store', false)
-  .option(
-    '--only-sdk',
-    'Use macOS SDKs instead of downloading full XCode versions when necessary',
-    false,
-  )
   .addOption(archOption)
   .option('--bootstrap', 'Run `e sync` and `e build` after creating the build config.')
   .addOption(
@@ -184,6 +176,11 @@ program
         }
       }
 
+      // ensure macOS SDKs are loaded
+      if (process.platform === 'darwin') {
+        ensureSDK();
+      }
+
       const config = createConfig(options);
 
       // make sure the config name is new

src/evm-config.js

@@ -215,9 +215,9 @@ function sanitizeConfig(name, config, overwrite = false) {
     changes.push(`fixed invalid property ${color.config('reclient: none')}`);
   }
 
-  if (!('preserveXcode' in config)) {
+  if ('preserveXcode' in config) {
     config.preserveXcode = 5;
-    changes.push(`defined ${color.config('preserveXcode')} to default value of 5`);
+    changes.push(`removed ${color.config('preserveXcode')} property`);
   }
 
   if (config.goma) {

src/utils/depot-tools.js

@@ -99,11 +99,6 @@ function depotOpts(config, opts = {}) {
     ...require('./reclient').env(config),
   };
 
-  if (!config.onlySdk) {
-    // use build-tools version of Xcode
-    opts.env.DEVELOPER_DIR = require('./xcode').XcodePath;
-  }
-
   // put depot tools at the front of the path
   const key = pathKey();
   const paths = [DEPOT_TOOLS_DIR];