commit f9f7f6931f521ddcab6f1f47294cc26326c4be1a
author Dan Stoza <stoza@google.com> Wed Jul 27 15:05:38 2016 -0700
committer Dan Stoza <stoza@google.com> Thu Sep 29 15:33:17 2016 -0700
tree 44fe95b84e5cba2b24c64704369b53c10eab5bc4
parent f1098abecf28185256a4df8b9f207e90400af675

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.

Test: Cherry-pick from internal branch
Bug: 30302693
Change-Id: I1e41e5f548d4b8329590a082d9b69155ba365be9

services/surfaceflinger/Android.mk

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