diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-19 04:20:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-19 04:20:37 +0000 |
commit | 45fe15eeb503848d355cfd62db97e4c54d441d71 (patch) | |
tree | c3609901810c5636883da56924cb5c7dfe4a2102 | |
parent | 13a3eebdf5a917f41e5bf4eb892c8971f1634662 (diff) | |
parent | ecea4a76d9fd937f4e79f71332190da98229495c (diff) | |
download | am57x-45fe15eeb503848d355cfd62db97e4c54d441d71.tar.gz |
Snap for 6084815 from ecea4a76d9fd937f4e79f71332190da98229495c to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-platform-releaseandroid11-gsi
Change-Id: I2830aee9d8fe7da56afde6e97b27e41e1f6b3948
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | libhwcomposer/drmfb.cpp | 2 | ||||
-rw-r--r-- | libhwcomposer/format.cpp | 2 | ||||
-rw-r--r-- | libhwcomposer/format.h | 2 | ||||
-rw-r--r-- | libhwcomposer/img_gralloc1_public.h (renamed from libhwcomposer/hal_public.h) | 0 |
5 files changed, 3 insertions, 4 deletions
@@ -1,3 +1,2 @@ soong_namespace { } - diff --git a/libhwcomposer/drmfb.cpp b/libhwcomposer/drmfb.cpp index 0421050..b6d1f64 100644 --- a/libhwcomposer/drmfb.cpp +++ b/libhwcomposer/drmfb.cpp @@ -23,7 +23,7 @@ #include "drmfb.h" #include "format.h" -#include "hal_public.h" +#include "img_gralloc1_public.h" DRMFramebuffer::DRMFramebuffer(int drm_fd, buffer_handle_t handle, bool is_overlay) : bo(), pitches(), offsets() diff --git a/libhwcomposer/format.cpp b/libhwcomposer/format.cpp index c0f469a..5a39907 100644 --- a/libhwcomposer/format.cpp +++ b/libhwcomposer/format.cpp @@ -21,7 +21,7 @@ #include <linux/types.h> #include "format.h" -#include "hal_public.h" +#include "img_gralloc1_public.h" bool is_valid_format(uint32_t format) { diff --git a/libhwcomposer/format.h b/libhwcomposer/format.h index 731c53a..633c704 100644 --- a/libhwcomposer/format.h +++ b/libhwcomposer/format.h @@ -23,7 +23,7 @@ #include <drm/drm_fourcc.h> #include <linux/types.h> -#include "hal_public.h" +#include "img_gralloc1_public.h" static inline std::string HAL_FMT(uint32_t format) { diff --git a/libhwcomposer/hal_public.h b/libhwcomposer/img_gralloc1_public.h index 5ca9bd2..5ca9bd2 100644 --- a/libhwcomposer/hal_public.h +++ b/libhwcomposer/img_gralloc1_public.h |