commit 10d3fb2360ae1a31d98a16c63952109825e09e55
author Dan Stoza <stoza@google.com> Wed Jul 27 15:05:38 2016 -0700
committer Dan Stoza <stoza@google.com> Wed Jul 27 15:05:38 2016 -0700
tree c7cf931c6ae087f83f0a963d020b35002902de5d
parent 52f82ade66349c4538c3cca8e293081eec0a688b

Build SF executable with USE_HWC2 when needed

The SurfaceFlinger executable wasn't picking up the USE_HWC2 flag when
enabled by the TARGET_USES_HWC2 BoardConfig, causing a mismatch in the
size of the SurfaceFlinger object. This fixes that by also passing
USE_HWC2 when building the executable.

Bug: 30302693
Change-Id: I1e41e5f548d4b8329590a082d9b69155ba365be9

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 2a8fa4a..dc5e97b 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -146,6 +146,10 @@
     LOCAL_CFLAGS += -DENABLE_CPUSETS
 endif
 
+ifeq ($(TARGET_USES_HWC2),true)
+    LOCAL_CFLAGS += -DUSE_HWC2
+endif
+
 LOCAL_SRC_FILES := \
     main_surfaceflinger.cpp