Revert "Revert "Shrink surfaceflinger""
This reverts commit 9b240e74075a316ccbbe1b0c2b96b8fc44f5aa65.
Reason for revert: Build issues should be resolved with aae69c45979dc000cd6dfb83f69e21c2d760339a and 9015e0f59b2f925711b0b55618cb065e44e627ca
Bug: 168077202
Change-Id: I2051fd4101aef5a6a0ad16c397b29d9fe9a6b8df
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index b039f6e..40e445b 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -186,22 +186,18 @@
],
}
-cc_library_shared {
- // Please use libsurfaceflinger_defaults to configure how the sources are
- // built, so the same settings can be used elsewhere.
- name: "libsurfaceflinger",
- defaults: ["libsurfaceflinger_production_defaults"],
- srcs: [
- ":libsurfaceflinger_sources",
-
- // Note: SurfaceFlingerFactory is not in the default sources so that it
- // can be easily replaced.
- "SurfaceFlingerFactory.cpp",
+cc_defaults {
+ name: "libsurfaceflinger_binary",
+ defaults: [
+ "surfaceflinger_defaults",
+ "libsurfaceflinger_production_defaults",
],
cflags: [
+ "-DLOG_TAG=\"SurfaceFlinger\"",
"-DUSE_VR_COMPOSER=1",
],
// VrComposer is not used when building surfaceflinger for vendors
+ // TODO: Is this ever built for vendors?
target: {
vendor: {
cflags: [
@@ -209,15 +205,6 @@
],
},
},
- logtags: ["EventLog/EventLogTags.logtags"],
-}
-
-cc_defaults {
- name: "libsurfaceflinger_binary",
- defaults: ["surfaceflinger_defaults"],
- cflags: [
- "-DLOG_TAG=\"SurfaceFlinger\"",
- ],
shared_libs: [
"android.frameworks.displayservice@1.0",
"android.hardware.configstore-utils",
@@ -239,12 +226,18 @@
"libserviceutils",
"libtrace_proto",
],
- ldflags: ["-Wl,--export-dynamic"],
+ logtags: ["EventLog/EventLogTags.logtags"],
}
filegroup {
name: "surfaceflinger_binary_sources",
- srcs: ["main_surfaceflinger.cpp"],
+ srcs: [
+ ":libsurfaceflinger_sources",
+ // Note: SurfaceFlingerFactory is not in the default sources so that it
+ // can be easily replaced.
+ "SurfaceFlingerFactory.cpp",
+ "main_surfaceflinger.cpp"
+ ],
}
cc_binary {
@@ -253,7 +246,6 @@
init_rc: ["surfaceflinger.rc"],
srcs: [":surfaceflinger_binary_sources"],
shared_libs: [
- "libsurfaceflinger",
"libSurfaceFlingerProp",
],
}