From 293756455cd7b6f48e34361281cf5ec4aca859d9 Mon Sep 17 00:00:00 2001
From: Renan <6718144+renancaraujo@users.noreply.github.com>
Date: Wed, 12 May 2021 01:09:09 +0100
Subject: [PATCH] Re-land:  Allow users to pass in Xcode build settings as env
 variables to flutter build macos FLUTTER_XCODE_  (#82298)

---
 .../lib/src/macos/build_macos.dart            |  1 +
 .../hermetic/build_macos_test.dart            | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/packages/flutter_tools/lib/src/macos/build_macos.dart b/packages/flutter_tools/lib/src/macos/build_macos.dart
index a225e28423..b5f166b571 100644
--- a/packages/flutter_tools/lib/src/macos/build_macos.dart
+++ b/packages/flutter_tools/lib/src/macos/build_macos.dart
@@ -114,6 +114,7 @@ Future<void> buildMacOS({
       else
         '-quiet',
       'COMPILER_INDEX_STORE_ENABLE=NO',
+      ...environmentVariablesAsXcodeBuildSettings(globals.platform)
     ],
     trace: true,
     stdoutErrorMatcher: verboseLogging ? null : _anyOutput,
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart
index 16a8fb0c96..5ae6e72fae 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart
@@ -45,6 +45,15 @@ final Platform macosPlatform = FakePlatform(
     'HOME': '/',
   }
 );
+
+final FakePlatform macosPlatformCustomEnv = FakePlatform(
+    operatingSystem: 'macos',
+    environment: <String, String>{
+      'FLUTTER_ROOT': '/',
+      'HOME': '/',
+    }
+);
+
 final Platform notMacosPlatform = FakePlatform(
   operatingSystem: 'linux',
   environment: <String, String>{
@@ -55,6 +64,8 @@ final Platform notMacosPlatform = FakePlatform(
 void main() {
   FileSystem fileSystem;
   TestUsage usage;
+  FakeProcessManager fakeProcessManager;
+  XcodeProjectInterpreter xcodeProjectInterpreter;
 
   setUpAll(() {
     Cache.disableLocking();
@@ -63,6 +74,8 @@ void main() {
   setUp(() {
     fileSystem = MemoryFileSystem.test();
     usage = TestUsage();
+    fakeProcessManager = FakeProcessManager.empty();
+    xcodeProjectInterpreter = FakeXcodeProjectInterpreter();
   });
 
   // Sets up the minimal mock project files necessary to look like a Flutter project.
@@ -301,6 +314,50 @@ void main() {
     Artifacts: () => Artifacts.test(),
   });
 
+  testUsingContext('build settings contains Flutter Xcode environment variables', () async {
+
+    macosPlatformCustomEnv.environment = Map<String, String>.unmodifiable(<String, String>{
+      'FLUTTER_XCODE_ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon.special'
+    });
+
+    final FlutterProject flutterProject = FlutterProject.fromDirectory(fileSystem.currentDirectory);
+    final Directory flutterBuildDir = fileSystem.directory(getMacOSBuildDirectory());
+
+    fakeProcessManager.addCommands(<FakeCommand>[
+      FakeCommand(
+        command: <String>[
+          '/usr/bin/env',
+          'xcrun',
+          'xcodebuild',
+          '-workspace', flutterProject.macos.xcodeWorkspace.path,
+          '-configuration', 'Debug',
+          '-scheme', 'Runner',
+          '-derivedDataPath', flutterBuildDir.absolute.path,
+          'OBJROOT=${fileSystem.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',
+          'SYMROOT=${fileSystem.path.join(flutterBuildDir.absolute.path, 'Build', 'Products')}',
+          '-quiet',
+          'COMPILER_INDEX_STORE_ENABLE=NO',
+          'ASSETCATALOG_COMPILER_APPICON_NAME=AppIcon.special',
+        ],
+      ),
+    ]);
+
+    final BuildCommand command = BuildCommand();
+    createMinimalMockProjectFiles();
+
+    await createTestCommandRunner(command).run(
+        const <String>['build', 'macos', '--debug', '--no-pub']
+    );
+
+    expect(fakeProcessManager.hasRemainingExpectations, isFalse);
+  }, overrides: <Type, Generator>{
+    FileSystem: () => fileSystem,
+    ProcessManager: () => fakeProcessManager,
+    Platform: () => macosPlatformCustomEnv,
+    FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true),
+    XcodeProjectInterpreter: () => xcodeProjectInterpreter,
+  });
+
   testUsingContext('macOS build supports build-name and build-number', () async {
     final BuildCommand command = BuildCommand();
     createMinimalMockProjectFiles();