diff options
| author | Christopher N. Hesse <raymanfx@gmail.com> | 2014-12-17 13:37:15 +0100 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2014-12-17 19:00:27 +0000 |
| commit | 8157110d1142f8bbf91cd32a412faf616a2363e4 (patch) | |
| tree | 4281b2ba18bb0f77937c37ceda36d1e0a3c3cbd5 | |
| parent | a3f1c0e3b378bfc9f498f7f601decafbb4ec2417 (diff) | |
| download | android_frameworks_native-8157110d1142f8bbf91cd32a412faf616a2363e4.tar.gz android_frameworks_native-8157110d1142f8bbf91cd32a412faf616a2363e4.tar.bz2 android_frameworks_native-8157110d1142f8bbf91cd32a412faf616a2363e4.zip | |
libs: binder: MemoryHeapIon: ifdef ION_EXYNOS_VIDEO_MASK
Exynos secure memory regions were separated here:
https://android.googlesource.com/platform/hardware/samsung_slsi/exynos5/+/ce73ba1%5E!/
Only compile the legacy ION_EXYNOS_VIDEO_MASK code if legacy HALs are used
(and ION_EXYNOS_VIDEO_MASK is defined).
Change-Id: I8cb58bbbb829d64a2ed39dbd27cc0d0ae3c9dd09
| -rw-r--r-- | libs/binder/MemoryHeapIon.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/binder/MemoryHeapIon.cpp b/libs/binder/MemoryHeapIon.cpp index c547395dc..34db5455b 100644 --- a/libs/binder/MemoryHeapIon.cpp +++ b/libs/binder/MemoryHeapIon.cpp @@ -84,8 +84,10 @@ uint32_t ion_FlagMask_valid_check(uint32_t flags) result |= ION_FLAG_CACHED_NEEDS_SYNC; if (flag_mask & MHB_ION_FLAG_PRESERVE_KMAP) result |= ION_FLAG_PRESERVE_KMAP; +#ifdef ION_EXYNOS_VIDEO_MASK if (flag_mask & MHB_ION_EXYNOS_VIDEO_MASK) result |= ION_EXYNOS_VIDEO_MASK; +#endif if (flag_mask & MHB_ION_EXYNOS_MFC_INPUT_MASK) result |= ION_EXYNOS_MFC_INPUT_MASK; if (flag_mask & MHB_ION_EXYNOS_MFC_OUTPUT_MASK) |