diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-01 20:30:24 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-01 20:30:24 +0000 |
| commit | 02268081af0ba21cf7610afe104167d946fdd786 (patch) | |
| tree | 27efd70201133d4902b4a7a35408edf5883e1092 | |
| parent | 2da2b0b44c2cbfc1d8e670c26b5db9fa6a021ede (diff) | |
| parent | 48ce23715a5f3cf094e014922d9110462791458c (diff) | |
Snap for 6877830 from 48ce23715a5f3cf094e014922d9110462791458c to sdk-releaseplatform-tools-30.0.5
Change-Id: Idee122377ccbee8e65b2080ef033512d151c0ee4
| -rw-r--r-- | gralloc/Android.mk | 2 | ||||
| -rw-r--r-- | gralloc/gralloc.cpp | 2 | ||||
| -rw-r--r-- | gralloc/gralloc_gbm.cpp | 12 | ||||
| -rw-r--r-- | manifest.xml | 18 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 2 |
5 files changed, 9 insertions, 27 deletions
diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 049b019..ec1c38e 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libdrm \ - libgbm \ + libgbm_mesa \ liblog \ libcutils diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp index c71e901..1cc9f55 100644 --- a/gralloc/gralloc.cpp +++ b/gralloc/gralloc.cpp @@ -24,7 +24,7 @@ #define LOG_TAG "GRALLOC-GBM" -#include <cutils/log.h> +#include <log/log.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> diff --git a/gralloc/gralloc_gbm.cpp b/gralloc/gralloc_gbm.cpp index bdb41b8..29d11cd 100644 --- a/gralloc/gralloc_gbm.cpp +++ b/gralloc/gralloc_gbm.cpp @@ -24,11 +24,12 @@ #define LOG_TAG "GRALLOC-GBM" -#include <cutils/log.h> +#include <log/log.h> #include <cutils/atomic.h> #include <cutils/properties.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> @@ -382,8 +383,7 @@ buffer_handle_t gralloc_gbm_bo_create(struct gbm_device *gbm, gbm_bo_handle_map.emplace(handle, bo); /* in pixels */ - struct gralloc_handle_t *ghandle = gralloc_handle(handle); - *stride = ghandle->stride / gralloc_gbm_get_bpp(format); + *stride = gralloc_handle(handle)->stride / gralloc_gbm_get_bpp(format); return handle; } @@ -420,7 +420,7 @@ int gralloc_gbm_bo_lock(buffer_handle_t handle, gbm_bo_set_user_data(bo, bo_data, gralloc_gbm_destroy_user_data); } - ALOGI("lock bo %p, cnt=%d, usage=%x", bo, bo_data->lock_count, usage); + ALOGV("lock bo %p, cnt=%d, usage=%x", bo, bo_data->lock_count, usage); /* allow multiple locks with compatible usages */ if (bo_data->lock_count && (bo_data->locked_for & usage) != usage) @@ -491,10 +491,10 @@ int gralloc_gbm_bo_lock_ycbcr(buffer_handle_t handle, { struct gralloc_handle_t *hnd = gralloc_handle(handle); int ystride, cstride; - void *addr; + void *addr = 0; int err; - ALOGD("handle %p, hnd %p, usage 0x%x", handle, hnd, usage); + ALOGV("handle %p, hnd %p, usage 0x%x", handle, hnd, usage); err = gralloc_gbm_bo_lock(handle, usage, x, y, w, h, &addr); if (err) diff --git a/manifest.xml b/manifest.xml index fee2945..10362de 100644 --- a/manifest.xml +++ b/manifest.xml @@ -142,22 +142,4 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl"> - <name>android.hardware.wifi.hostapd</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IHostapd</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.wifi.supplicant</name> - <transport>hwbinder</transport> - <version>1.2</version> - <interface> - <name>ISupplicant</name> - <instance>default</instance> - </interface> - </hal> </manifest> diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index d16f3fc..bf856df 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -40,6 +40,6 @@ /vendor/lib(64)?/hw/gralloc\.gbm\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libdrm_freedreno\.so u:object_r:same_process_hal_file:s0 -/vendor/lib(64)?/libgbm\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libgbm_mesa\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libglapi\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libqrtr\.so u:object_r:same_process_hal_file:s0 |