diff options
| author | Colin Cross <ccross@android.com> | 2014-02-21 13:54:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 13:54:24 +0000 |
| commit | d14b0c1860c9a16297064fbec84395369bbd74af (patch) | |
| tree | f11e3ff02bf3bc386ca87854aef2d67931fdc9a0 /services | |
| parent | ee319ab1d29f9cfd98752e8e3e876c9e7fccb264 (diff) | |
| parent | 361d9df38cf9760baffc863d5364a1df9cf8be6b (diff) | |
| download | frameworks_native-d14b0c1860c9a16297064fbec84395369bbd74af.zip frameworks_native-d14b0c1860c9a16297064fbec84395369bbd74af.tar.gz frameworks_native-d14b0c1860c9a16297064fbec84395369bbd74af.tar.bz2 | |
am 361d9df3: am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
* commit '361d9df38cf9760baffc863d5364a1df9cf8be6b':
surfaceflinger: add BoardConfig.mk variable to force 32-bit
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index b2bc550..49a017f 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -120,6 +120,10 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= surfaceflinger +ifdef TARGET_32_BIT_SURFACEFLINGER +LOCAL_32_BIT_ONLY := true +endif + include $(BUILD_EXECUTABLE) ############################################################### |