From afa24b1a189c03416f6bb4624f2a952de5bc47fe Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 27 Jan 2020 19:10:27 -0800
Subject: [PATCH] [flutter_tools] only strip when bitcode is enabled (#49595)

---
 packages/flutter_tools/lib/src/base/build.dart              | 6 +++++-
 .../flutter_tools/test/general.shard/base/build_test.dart   | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart
index f2399297fd3..393104dab05 100644
--- a/packages/flutter_tools/lib/src/base/build.dart
+++ b/packages/flutter_tools/lib/src/base/build.dart
@@ -137,7 +137,11 @@ class AOTSnapshotter {
       outputPaths.add(assembly);
       genSnapshotArgs.add('--snapshot_kind=app-aot-assembly');
       genSnapshotArgs.add('--assembly=$assembly');
-      genSnapshotArgs.add('--strip');
+      // TODO(jonahwilliams): determine the correct time to use strip
+      // since this is required for the future dwarf strack traces option.
+      if (bitcode) {
+        genSnapshotArgs.add('--strip');
+      }
     } else {
       final String aotSharedLibrary = globals.fs.path.join(outputDir.path, 'app.so');
       outputPaths.add(aotSharedLibrary);
diff --git a/packages/flutter_tools/test/general.shard/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart
index 204ffe16877..c8e11dde01f 100644
--- a/packages/flutter_tools/test/general.shard/base/build_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/build_test.dart
@@ -445,7 +445,6 @@ void main() {
         '--deterministic',
         '--snapshot_kind=app-aot-assembly',
         '--assembly=$assembly',
-        '--strip',
         '--no-sim-use-hardfp',
         '--no-use-integer-division',
         '--no-causal-async-stacks',
@@ -495,7 +494,6 @@ void main() {
         '--deterministic',
         '--snapshot_kind=app-aot-assembly',
         '--assembly=${globals.fs.path.join(outputPath, 'snapshot_assembly.S')}',
-        '--strip',
         '--no-causal-async-stacks',
         '--lazy-async-stacks',
         'main.dill',
@@ -534,7 +532,6 @@ void main() {
         '--deterministic',
         '--snapshot_kind=app-aot-assembly',
         '--assembly=${globals.fs.path.join(outputPath, 'snapshot_assembly.S')}',
-        '--strip',
         '--no-sim-use-hardfp',
         '--no-use-integer-division',
         '--no-causal-async-stacks',
@@ -575,7 +572,6 @@ void main() {
         '--deterministic',
         '--snapshot_kind=app-aot-assembly',
         '--assembly=${globals.fs.path.join(outputPath, 'snapshot_assembly.S')}',
-        '--strip',
         '--no-causal-async-stacks',
         '--lazy-async-stacks',
         'main.dill',