Fix iOS and Android component builds

After the changes in http://crrev.com/c/2797833 Bug: angleproject:5811, angleproject:5820 Change-Id: I629978684ba4d002c296d4dcfe434b09782db4b1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2812698 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix iOS and Android component builds
0eaaff28 · Yuly Novikov · Commit Bot · cec90118 · 0eaaff28 · 0eaaff28
Commit 0eaaff28 authored Apr 07, 2021 by Yuly Novikov Committed by Commit Bot Apr 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

BUILD.gn src/tests/restricted_traces/BUILD.gn +4 -0

frame_capture_test_utils.h util/frame_capture_test_utils.h +5 -0

No files found.
--- a/src/tests/restricted_traces/BUILD.gn
+++ b/src/tests/restricted_traces/BUILD.gn
@@ -22,6 +22,10 @@ angle_trace_fixture("angle_restricted_trace_fixture") {
  gl_header = "angle_trace_gl.h"
  public_deps = [ ":angle_restricted_trace_loader" ]
  public_configs = [ "$angle_root:no_gl_prototypes" ]
+  if (is_ios) {
+    # shared libraries are hidden inside ios_framework_bundle, but we include headers from them
+    check_includes = false
+  }
 }

 # Imports "angle_restricted_traces"

--- a/util/frame_capture_test_utils.h
+++ b/util/frame_capture_test_utils.h
@@ -70,6 +70,11 @@ class TraceLibrary
        traceNameStr << "lib";
 #endif  // !defined(ANGLE_PLATFORM_WINDOWS)
        traceNameStr << traceNameIn;
+#if defined(ANGLE_PLATFORM_ANDROID) && defined(COMPONENT_BUILD)
+        // Added to shared library names in Android component builds in
+        // https://chromium.googlesource.com/chromium/src/+/9bacc8c4868cc802f69e1e858eea6757217a508f/build/toolchain/toolchain.gni#56
+        traceNameStr << ".cr";
+#endif  // defined(ANGLE_PLATFORM_ANDROID) && defined(COMPONENT_BUILD)
        std::string traceName = traceNameStr.str();
        mTraceLibrary.reset(OpenSharedLibrary(traceName.c_str(), SearchType::ApplicationDir));
    }