From 7aa8656d1dd8440ec9a96d4a71b6bdb37b9f769e Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 20 May 2020 16:08:50 +0000
Subject: [PATCH] [benchmark] Share BoringSSL between FfiBoringssl
 implementations.

The Dart benchmarks will soon be forked for non-nullability and there
will be two implementations of the FfiBoringssl benchmark. This change
moves the native BoringSSL build a level up so it can be shared between
the two implementations, avoiding doubling the needed filesystem space.

Change-Id: I8bcc113e19715865f28bc1950cf07ba6cc7ea61f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/148760
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 DEPS                                                  | 2 +-
 benchmarks/FfiBoringssl/dart/digest.dart              | 4 ++--
 benchmarks/FfiBoringssl/{dart => }/native/.gitignore  | 0
 benchmarks/FfiBoringssl/{dart => }/native/Makefile    | 0
 benchmarks/FfiBoringssl/{dart => }/native/arm.cmake   | 0
 benchmarks/FfiBoringssl/{dart => }/native/arm64.cmake | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename benchmarks/FfiBoringssl/{dart => }/native/.gitignore (100%)
 rename benchmarks/FfiBoringssl/{dart => }/native/Makefile (100%)
 rename benchmarks/FfiBoringssl/{dart => }/native/arm.cmake (100%)
 rename benchmarks/FfiBoringssl/{dart => }/native/arm64.cmake (100%)

diff --git a/DEPS b/DEPS
index 748ec4caa14..dc889fcde2e 100644
--- a/DEPS
+++ b/DEPS
@@ -477,7 +477,7 @@ deps = {
 
   # TODO(37531): Remove these cipd packages and build with sdk instead when
   # benchmark runner gets support for that.
-  Var("dart_root") + "/benchmarks/FfiBoringssl/dart/native/out/": {
+  Var("dart_root") + "/benchmarks/FfiBoringssl/native/out/": {
       "packages": [
           {
               "package": "dart/benchmarks/ffiboringssl",
diff --git a/benchmarks/FfiBoringssl/dart/digest.dart b/benchmarks/FfiBoringssl/dart/digest.dart
index ecc869bb26c..655e12f95e3 100644
--- a/benchmarks/FfiBoringssl/dart/digest.dart
+++ b/benchmarks/FfiBoringssl/dart/digest.dart
@@ -14,9 +14,9 @@ import 'types.dart';
 DynamicLibrary openSsl() {
   // Force load crypto.
   dlopenPlatformSpecific("crypto",
-      path: Platform.script.resolve("native/out/").path);
+      path: Platform.script.resolve("../native/out/").path);
   DynamicLibrary ssl = dlopenPlatformSpecific("ssl",
-      path: Platform.script.resolve("native/out/").path);
+      path: Platform.script.resolve("../native/out/").path);
   return ssl;
 }
 
diff --git a/benchmarks/FfiBoringssl/dart/native/.gitignore b/benchmarks/FfiBoringssl/native/.gitignore
similarity index 100%
rename from benchmarks/FfiBoringssl/dart/native/.gitignore
rename to benchmarks/FfiBoringssl/native/.gitignore
diff --git a/benchmarks/FfiBoringssl/dart/native/Makefile b/benchmarks/FfiBoringssl/native/Makefile
similarity index 100%
rename from benchmarks/FfiBoringssl/dart/native/Makefile
rename to benchmarks/FfiBoringssl/native/Makefile
diff --git a/benchmarks/FfiBoringssl/dart/native/arm.cmake b/benchmarks/FfiBoringssl/native/arm.cmake
similarity index 100%
rename from benchmarks/FfiBoringssl/dart/native/arm.cmake
rename to benchmarks/FfiBoringssl/native/arm.cmake
diff --git a/benchmarks/FfiBoringssl/dart/native/arm64.cmake b/benchmarks/FfiBoringssl/native/arm64.cmake
similarity index 100%
rename from benchmarks/FfiBoringssl/dart/native/arm64.cmake
rename to benchmarks/FfiBoringssl/native/arm64.cmake