Commit d14b0c18 authored Feb 21, 2014 by Colin Cross Committed by Android Git Automerger Feb 21, 2014

am 361d9df3: am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"

* commit '361d9df3':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit

services/surfaceflinger/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,10 @@ LOCAL_SHARED_LIBRARIES := \

		LOCAL_MODULE:= surfaceflinger

		ifdef TARGET_32_BIT_SURFACEFLINGER
		LOCAL_32_BIT_ONLY := true
		endif

		include $(BUILD_EXECUTABLE)

		###############################################################