| author | Stark Li <stark.li@amlogic.com> | 2017-02-24 11:24:53 (GMT) |
|---|---|---|
| committer | Stark Li <stark.li@amlogic.com> | 2017-02-24 11:24:53 (GMT) |
| commit | e3d6050d03459ea5c9069a3a75427735df7facc9 (patch) | |
| tree | 424074e3e604ab327834c09a1b07e8eb9ed55f40 | |
| parent | a8d56bbbe86e91a6ff158990a24587a9698bedbc (diff) | |
| download | gralloc-e3d6050d03459ea5c9069a3a75427735df7facc9.zip gralloc-e3d6050d03459ea5c9069a3a75427735df7facc9.tar.gz gralloc-e3d6050d03459ea5c9069a3a75427735df7facc9.tar.bz2 | |
PD#138788: add config for secure layer
Change-Id: I72127151a80356f6fa5f7df9cbeb82873907cd33
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | alloc_ion.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -164,6 +164,10 @@ ifeq ($(TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER),true) LOCAL_CFLAGS += -DGRALLOC_APP_ALLOC_CONTINUOUS_BUF endif +ifeq ($(TARGET_SUPPORT_SECURE_LAYER),true) +LOCAL_CFLAGS += -DGRALLOC_ENABLE_SECURE_LAYER +endif + LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64 LOCAL_MODULE_RELATIVE_PATH := hw diff --git a/alloc_ion.cpp b/alloc_ion.cpp index f290974..09692e9 100644 --- a/alloc_ion.cpp +++ b/alloc_ion.cpp @@ -53,7 +53,6 @@ int alloc_backend_alloc(alloc_device_t* dev, size_t size, int usage, buffer_hand if (usage & GRALLOC_USAGE_AML_SECURE) { secureOrProtectedLayer = true; - // usage &= ~GRALLOC_USAGE_AML_SECURE; } if (usage & GRALLOC_USAGE_PROTECTED) @@ -178,10 +177,13 @@ int alloc_backend_alloc(alloc_device_t* dev, size_t size, int usage, buffer_hand { hnd->flags |= private_handle_t::PRIV_FLAGS_CONTINUOUS_BUF; } + +#ifdef GRALLOC_ENABLE_SECURE_LAYER if (secureOrProtectedLayer) { hnd->flags |= private_handle_t::PRIV_FLAGS_SECURE_PROTECTED; } +#endif return 0; } else |