SF: Convert to Android.bp
Eliminate the makefiles and convert to using blueprint files for
SurfaceFlinger. Along the way, set up a few things (filegroups,
cc_defaults) to add a unit test build in a change to come.
One configuration feature was dropped, as I was unsure of how to
replicate it in the blueprint configuration:
TARGET_32_BIT_SURFACEFLINGER
Test: Builds, usable on Pixel XL
Test: "atest SurfaceFlinger_test" works (but has failing tests)
Bug: None
Change-Id: I2d574855e53932fbb021afc9d61c4a3bb317330c
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 1c5b2d6..9b6f0c5 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -26,7 +26,6 @@
includeFiles = [ "include" ]
staticLibraries = [
- "libsurfaceflingerincludes",
"libbufferhub",
"libbufferhubqueue",
"libdisplay",
@@ -63,8 +62,9 @@
]
headerLibraries = [
- "libdvr_headers",
"android.hardware.graphics.composer@2.1-command-buffer",
+ "libdvr_headers",
+ "libsurfaceflinger_headers",
]
cc_library_static {