Merge ~vicamo/android-headers/+git/android-headers:for-launchpad/align-arm64-struct-size into android-headers:master

Proposed by You-Sheng Yang
Status: Merged
Merge reported by: Simon Fels
Merged at revision: not available
Proposed branch: ~vicamo/android-headers/+git/android-headers:for-launchpad/align-arm64-struct-size
Merge into: android-headers:master
Diff against target: 29 lines (+8/-0)
1 file modified
19/hardware/hardware.h (+8/-0)
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+302644@code.launchpad.net

Description of the change

android-19: hardware: align struct size on arm64

All other(21,22,23) versions have addressed this issue.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/19/hardware/hardware.h b/19/hardware/hardware.h
2index 416ae39..74f57aa 100644
3--- a/19/hardware/hardware.h
4+++ b/19/hardware/hardware.h
5@@ -144,8 +144,12 @@ typedef struct hw_module_t {
6 /** module's dso */
7 void* dso;
8
9+#ifdef __LP64__
10+ uint64_t reserved[32-7];
11+#else
12 /** padding to 128 bytes, reserved for future use */
13 uint32_t reserved[32-7];
14+#endif
15
16 } hw_module_t;
17
18@@ -186,7 +190,11 @@ typedef struct hw_device_t {
19 struct hw_module_t* module;
20
21 /** padding reserved for future use */
22+#ifdef __LP64__
23+ uint64_t reserved[12];
24+#else
25 uint32_t reserved[12];
26+#endif
27
28 /** Close this device */
29 int (*close)(struct hw_device_t* device);

Subscribers

People subscribed via source and target branches