Allow ANGLE libs to have arbitrary suffix.

BUILD.gn

@@ -588,7 +588,7 @@ config("angle_static") {
   ]
 }
 
-shared_library("libGLESv2") {
+shared_library("libGLESv2${angle_libs_suffix}") {
   sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
 
   if (is_android) {
@@ -655,7 +655,7 @@ static_library("libGLESv2_static") {
   ]
 }
 
-shared_library("libGLESv1_CM") {
+shared_library("libGLESv1_CM${angle_libs_suffix}") {
   sources = rebase_path(gles_gypi.libglesv1_cm_sources, ".", "src")
 
   if (is_android) {
@@ -693,7 +693,7 @@ shared_library("libGLESv1_CM") {
 
   deps = [
     ":includes",
-    ":libGLESv2",
+    ":libGLESv2${angle_libs_suffix}",
     "//build/config:exe_and_shlib_deps",
   ]
 }
@@ -717,7 +717,7 @@ static_library("libGLESv1_CM_static") {
   ]
 }
 
-shared_library("libEGL") {
+shared_library("libEGL${angle_libs_suffix}") {
   sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
 
   if (is_android) {
@@ -752,7 +752,7 @@ shared_library("libEGL") {
 
   deps = [
     ":includes",
-    ":libGLESv2",
+    ":libGLESv2${angle_libs_suffix}",
     "//build/config:exe_and_shlib_deps",
   ]
 }
@@ -796,7 +796,7 @@ foreach(is_shared_library,
   if (is_shared_library) {
     library_type = "shared_library"
     library_name = "angle_util"
-    dep_suffix = ""
+    dep_suffix = "${angle_libs_suffix}"
   } else {
     library_type = "static_library"
     library_name = "angle_util_static"

doc/DebuggingTips.md

@@ -34,4 +34,30 @@ This is done with the gn arg:
 angle_shared_libvulkan = true
 ```
 
-When capturing traces of gtest based tests built inside Chromium checkout, make sure to run the tests with `--single-process-tests` argument.
+When capturing traces of gtest based tests built inside Chromium checkout, make sure to run the tests with `--single-process-tests` argument.
\ No newline at end of file
+
+## Running ANGLE under GAPID on Android
+
+[GAPID](https://github.com/google/gapid) can be used to capture a trace of the Vulkan or OpenGL ES command stream on Android.
+For it to work, ANGLE's libraries must have different names from the system OpenGL libraries.
+This is done with the gn arg:
+```
+angle_libs_suffix = "_ANGLE"
+```
+
+All [NativeTest](https://chromium.googlesource.com/chromium/src/+/master/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java) based tests share the same activity name, `org.chromium.native_test.NativeUnitTestNativeActivity`. Thus, prior to capturing your test trace, the specific test APK must be installed on the device. When you build the test, a test launcher is generated, for example, `./out/Release/bin/run_angle_end2end_tests`. The best way to install the APK is to run this test launcher once.
+
+In GAPID's "Capture Trace" dialog, "Package / Action:" should be
+```
+android.intent.action.MAIN:org.chromium.native_test/org.chromium.native_test.NativeUnitTestNativeActivity
+```
+
+The mandatory [extra intent argument](https://developer.android.com/studio/command-line/adb.html#IntentSpec) for starting the activity is `org.chromium.native_test.NativeTest.StdoutFile`. Without it the test APK crashes. Test filters can be specified via either the `org.chromium.native_test.NativeTest.CommandLineFlags` or the `org.chromium.native_test.NativeTest.Shard` argument.
+Example "Intent Arguments:" values in GAPID's "Capture Trace" dialog:
+```
+-e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt -e org.chromium.native_test.NativeTest.CommandLineFlags "--gtest_filter=*ES2_VULKAN"
+```
+or
+```
+-e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt --esal org.chromium.native_test.NativeTest.Shard RendererTest.SimpleOperation/ES2_VULKAN,SimpleOperationTest.DrawWithTexture/ES2_VULKAN
+```
\ No newline at end of file

gni/angle.gni

@@ -32,6 +32,7 @@ declare_args() {
         (current_cpu == "arm64" && android64_ndk_api_level >= 24)
   }
   angle_shared_libvulkan = false
+  angle_libs_suffix = ""
 }
 
 declare_args() {

samples/BUILD.gn

@@ -2,17 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("../gni/angle.gni")
+
 executable("shader_translator") {
-  sources = [ "shader_translator/shader_translator.cpp", ]
-  include_dirs = [ "../include", ]
-  deps = [ "../:translator", ]
+  sources = [
+    "shader_translator/shader_translator.cpp",
+  ]
+  include_dirs = [ "../include" ]
+  deps = [
+    "../:translator",
+  ]
 }
 
 config("sample_util_config") {
   include_dirs = [ "sample_util" ]
 }
 
-
 static_library("sample_util") {
   sources = [
     "sample_util/SampleApplication.cpp",
@@ -25,8 +30,8 @@ static_library("sample_util") {
   deps = [
     "../:angle_common",
     "../:angle_util",
-    "../:libEGL",
-    "../:libGLESv2",
+    "../:libEGL${angle_libs_suffix}",
+    "../:libGLESv2${angle_libs_suffix}",
   ]
   public_configs = [ ":sample_util_config" ]
 }

src/tests/BUILD.gn

@@ -126,6 +126,10 @@ if (is_win || is_linux || is_mac || is_android) {
       "../../src/tests",
       "../../util",
     ]
+    defines = [
+      "ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}\"",
+      "ANGLE_GLESV2_LIBRARY_NAME=\"libGLESv2${angle_libs_suffix}\"",
+    ]
 
     if (is_android) {
       use_native_activity = true
@@ -174,8 +178,8 @@ if (is_win || is_linux || is_mac || is_android) {
     deps = googletest_deps + [
              angle_root + ":angle_image_util",
              angle_root + ":angle_util",
-             angle_root + ":libEGL",
-             angle_root + ":libGLESv2",
+             angle_root + ":libEGL${angle_libs_suffix}",
+             angle_root + ":libGLESv2${angle_libs_suffix}",
              angle_root + ":preprocessor",
              angle_root + ":translator",
            ]
@@ -467,9 +471,9 @@ if (build_angle_gles1_conform_tests) {
              ":angle_gles1_conformance_no_gtest",
              angle_root + ":angle_common",
              angle_root + ":angle_util",
-             angle_root + ":libEGL",
-             angle_root + ":libGLESv1_CM",
-             angle_root + ":libGLESv2",
+             angle_root + ":libEGL${angle_libs_suffix}",
+             angle_root + ":libGLESv1_CM${angle_libs_suffix}",
+             angle_root + ":libGLESv2${angle_libs_suffix}",
              angle_root + ":preprocessor",
              angle_root + ":translator",
            ]
@@ -592,9 +596,10 @@ if (build_angle_deqp_tests) {
       ":angle_deqp_decpp",
       angle_root + ":angle_common",
       angle_root + ":angle_util",
-      angle_root + ":libEGL",
+      angle_root + ":libEGL${angle_libs_suffix}",
       "//third_party/libpng:libpng",
     ]
+    defines = [ "ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}\"" ]
 
     configs -= deqp_undefine_configs
     public_configs = [ ":angle_deqp_libtester_config" ]

src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp

@@ -34,11 +34,11 @@
 
 // clang-format off
 #if (DE_OS == DE_OS_WIN32)
-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.dll"
+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".dll"
 #elif (DE_OS == DE_OS_UNIX) || (DE_OS == DE_OS_ANDROID)
-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.so"
+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".so"
 #elif (DE_OS == DE_OS_OSX)
-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.dylib"
+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".dylib"
 #else
     #error "Unsupported platform"
 #endif
@@ -149,7 +149,7 @@ class NativeWindow : public eglu::NativeWindow
 ANGLENativeDisplay::ANGLENativeDisplay(const std::vector<EGLAttrib> &attribs)
     : eglu::NativeDisplay(DISPLAY_CAPABILITIES, EGL_PLATFORM_ANGLE_ANGLE, "EGL_EXT_platform_base"),
       mDeviceContext(EGL_DEFAULT_DISPLAY),
-      mLibrary(ANGLE_EGL_LIBRARY_NAME),
+      mLibrary(ANGLE_EGL_LIBRARY_FULL_NAME),
       mPlatformAttributes(attribs)
 {
 }

src/tests/egl_tests/EGLThreadTest.cpp

@@ -40,8 +40,8 @@ DWORD WINAPI EGLThreadTest::ThreadingTestEntryPoint(LPVOID lpParameter)
 
 void EGLThreadTest::ThreadingTest()
 {
-    mEGL = LoadLibrary(TEXT("libEGL.dll"));
-    mGLESv2 = LoadLibrary(TEXT("libGLESv2.dll"));
+    mEGL    = LoadLibrary(TEXT(ANGLE_EGL_LIBRARY_NAME ".dll"));
+    mGLESv2 = LoadLibrary(TEXT(ANGLE_GLESV2_LIBRARY_NAME ".dll"));
 
     EXPECT_TRUE(mEGL != nullptr);
     EXPECT_TRUE(mGLESv2 != nullptr);