commit 235d6d6644f449da3bcb58bc299bc7a9f3048904
author Anton Ivanov <aii@google.com> Wed Mar 12 23:05:08 2025 -0700
committer Anton Ivanov <aii@google.com> Wed Mar 12 23:20:56 2025 -0700
tree ac788f67070c69f974ffef47d7790e5179a2fba8
parent 0c638dc935abafed86b8798ac661c2498050fc5d

Remove flags from cppflags of libgui_test.

Also fix tests that depend on them.

Rationale: libgui_test currently suffers from ODR violations due to a)
including statically built sources of libgui via the defaults, and b)
loading libgui at runtime via transitive shared library dependency.

The flags set via cppflags affect only a), and this blocks fixing the
ODR violation, which would be done by removing a) and standardizing on
b).  Since flags can be in different stagges of rollout, tests need to
be resilient to encountering either value of the flags.

Flag: EXEMPT refactor
Test: presubmit
Bug: 399711310
Change-Id: I3780eae83facf272f885dc0187c64c13d58e4cdf

libs/gui/tests/Android.bp

diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp
index e20345d..64f81c7 100644
--- a/libs/gui/tests/Android.bp
+++ b/libs/gui/tests/Android.bp
@@ -51,11 +51,6 @@
         "-Werror",
         "-Wextra",
         "-Wthread-safety",
-        "-DCOM_ANDROID_GRAPHICS_LIBGUI_FLAGS_BQ_SETFRAMERATE=true",
-        "-DCOM_ANDROID_GRAPHICS_LIBGUI_FLAGS_BQ_EXTENDEDALLOCATE=true",
-        "-DCOM_ANDROID_GRAPHICS_LIBGUI_FLAGS_WB_CONSUMER_BASE_OWNS_BQ=true",
-        "-DCOM_ANDROID_GRAPHICS_LIBGUI_FLAGS_WB_PLATFORM_API_IMPROVEMENTS=true",
-        "-DCOM_ANDROID_GRAPHICS_LIBGUI_FLAGS_WB_UNLIMITED_SLOTS=true",
     ],
 
     srcs: [

libs/gui/tests/BufferQueue_test.cpp

diff --git a/libs/gui/tests/BufferQueue_test.cpp b/libs/gui/tests/BufferQueue_test.cpp
index cfbb2e7..e22f57e 100644
--- a/libs/gui/tests/BufferQueue_test.cpp
+++ b/libs/gui/tests/BufferQueue_test.cpp
@@ -1452,10 +1452,6 @@
     ASSERT_EQ(NO_INIT, mProducer->disconnect(NATIVE_WINDOW_API_CPU));
 }
 
-TEST_F(BufferQueueTest, TestBqSetFrameRateFlagBuildTimeIsSet) {
-    ASSERT_EQ(flags::bq_setframerate(), COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE));
-}
-
 struct BufferItemConsumerSetFrameRateListener : public BufferItemConsumer {
     BufferItemConsumerSetFrameRateListener() : BufferItemConsumer(GRALLOC_USAGE_SW_READ_OFTEN, 1) {}
 
@@ -1561,9 +1557,14 @@
             {.name = "android.hardware.graphics.common.Dataspace", ADATASPACE_DISPLAY_P3},
     }};
 
-    ASSERT_EQ(NO_INIT,
-              native_window_set_buffers_additional_options(surface.get(), extras.data(),
-                                                           extras.size()));
+    auto status = native_window_set_buffers_additional_options(surface.get(), extras.data(),
+                                                               extras.size());
+    if (flags::bq_extendedallocate()) {
+        ASSERT_EQ(NO_INIT, status);
+    } else {
+        ASSERT_EQ(INVALID_OPERATION, status);
+        GTEST_SKIP() << "Flag bq_extendedallocate not enabled";
+    }
 
     if (!IsCuttlefish()) {
         GTEST_SKIP() << "Not cuttlefish";