commit d0924ebcbb888f9bef8f67c7d6a4f51380ef3c67
author Leon Scroggins <scroggo@google.com> Mon Feb 05 18:50:23 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 05 18:50:23 2024 +0000
tree c158174c3ee1f3f71ac1a5c2994b81998d719ade
parent f193ec59d623d0a26f3b0603a672076bf33fda70
parent 10c6293422809235b7f01f17ddda457cf9345c53

Merge "Remove FlagManager's dependence on librenderengine" into main

libs/renderengine/Android.bp

diff --git a/libs/renderengine/Android.bp b/libs/renderengine/Android.bp
index ba2eb7d..9494ee5 100644
--- a/libs/renderengine/Android.bp
+++ b/libs/renderengine/Android.bp
@@ -53,6 +53,13 @@
     export_include_dirs: ["include"],
 }
 
+// Needed by FlagManager to access a #define.
+cc_library_static {
+    name: "librenderengine_includes",
+    local_include_dirs: ["include"],
+    export_include_dirs: ["include"],
+}
+
 filegroup {
     name: "librenderengine_sources",
     srcs: [

services/surfaceflinger/common/Android.bp

diff --git a/services/surfaceflinger/common/Android.bp b/services/surfaceflinger/common/Android.bp
index 5ef22b5..e125bbe 100644
--- a/services/surfaceflinger/common/Android.bp
+++ b/services/surfaceflinger/common/Android.bp
@@ -18,7 +18,7 @@
         "server_configurable_flags",
     ],
     static_libs: [
-        "librenderengine",
+        "librenderengine_includes",
     ],
     srcs: [
         "FlagManager.cpp",