1
=== added file '3rd_party/android-deps/android/native_window.h'
2
--- 3rd_party/android-deps/android/native_window.h	1970-01-01 00:00:00 +0000
3
+++ 3rd_party/android-deps/android/native_window.h	2015-09-24 04:45:04 +0000
4
@@ -0,0 +1,126 @@
5
1
/*
6
2
 * Copyright (C) 2010 The Android Open Source Project
7
3
 *
8
4
 * Licensed under the Apache License, Version 2.0 (the "License");
9
5
 * you may not use this file except in compliance with the License.
10
6
 * You may obtain a copy of the License at
11
7
 *
12
8
 *      http://www.apache.org/licenses/LICENSE-2.0
13
9
 *
14
10
 * Unless required by applicable law or agreed to in writing, software
15
11
 * distributed under the License is distributed on an "AS IS" BASIS,
16
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17
13
 * See the License for the specific language governing permissions and
18
14
 * limitations under the License.
19
15
 */
20
16
21
17
#ifndef ANDROID_NATIVE_WINDOW_H
22
18
#define ANDROID_NATIVE_WINDOW_H
23
19
24
20
#include <android/rect.h>
25
21
26
22
#ifdef __cplusplus
27
23
extern "C" {
28
24
#endif
29
25
30
26
/*
31
27
 * Pixel formats that a window can use.
32
28
 */
33
29
enum {
34
30
    WINDOW_FORMAT_RGBA_8888          = 1,
35
31
    WINDOW_FORMAT_RGBX_8888          = 2,
36
32
    WINDOW_FORMAT_RGB_565            = 4,
37
33
};
38
34
39
35
struct ANativeWindow;
40
36
typedef struct ANativeWindow ANativeWindow;
41
37
42
38
typedef struct ANativeWindow_Buffer {
43
39
    // The number of pixels that are show horizontally.
44
40
    int32_t width;
45
41
46
42
    // The number of pixels that are shown vertically.
47
43
    int32_t height;
48
44
49
45
    // The number of *pixels* that a line in the buffer takes in
50
46
    // memory.  This may be >= width.
51
47
    int32_t stride;
52
48
53
49
    // The format of the buffer.  One of WINDOW_FORMAT_*
54
50
    int32_t format;
55
51
56
52
    // The actual bits.
57
53
    void* bits;
58
54
    
59
55
    // Do not touch.
60
56
    uint32_t reserved[6];
61
57
} ANativeWindow_Buffer;
62
58
63
59
/**
64
60
 * Acquire a reference on the given ANativeWindow object.  This prevents the object
65
61
 * from being deleted until the reference is removed.
66
62
 */
67
63
void ANativeWindow_acquire(ANativeWindow* window);
68
64
69
65
/**
70
66
 * Remove a reference that was previously acquired with ANativeWindow_acquire().
71
67
 */
72
68
void ANativeWindow_release(ANativeWindow* window);
73
69
74
70
/*
75
71
 * Return the current width in pixels of the window surface.  Returns a
76
72
 * negative value on error.
77
73
 */
78
74
int32_t ANativeWindow_getWidth(ANativeWindow* window);
79
75
80
76
/*
81
77
 * Return the current height in pixels of the window surface.  Returns a
82
78
 * negative value on error.
83
79
 */
84
80
int32_t ANativeWindow_getHeight(ANativeWindow* window);
85
81
86
82
/*
87
83
 * Return the current pixel format of the window surface.  Returns a
88
84
 * negative value on error.
89
85
 */
90
86
int32_t ANativeWindow_getFormat(ANativeWindow* window);
91
87
92
88
/*
93
89
 * Change the format and size of the window buffers.
94
90
 *
95
91
 * The width and height control the number of pixels in the buffers, not the
96
92
 * dimensions of the window on screen.  If these are different than the
97
93
 * window's physical size, then it buffer will be scaled to match that size
98
94
 * when compositing it to the screen.
99
95
 *
100
96
 * For all of these parameters, if 0 is supplied then the window's base
101
97
 * value will come back in force.
102
98
 *
103
99
 * width and height must be either both zero or both non-zero.
104
100
 *
105
101
 */
106
102
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window,
107
103
        int32_t width, int32_t height, int32_t format);
108
104
109
105
/**
110
106
 * Lock the window's next drawing surface for writing.
111
107
 * inOutDirtyBounds is used as an in/out parameter, upon entering the
112
108
 * function, it contains the dirty region, that is, the region the caller
113
109
 * intends to redraw. When the function returns, inOutDirtyBounds is updated
114
110
 * with the actual area the caller needs to redraw -- this region is often
115
111
 * extended by ANativeWindow_lock.
116
112
 */
117
113
int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffer,
118
114
        ARect* inOutDirtyBounds);
119
115
120
116
/**
121
117
 * Unlock the window's drawing surface after previously locking it,
122
118
 * posting the new buffer to the display.
123
119
 */
124
120
int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
125
121
126
122
#ifdef __cplusplus
127
123
};
128
124
#endif
129
125
130
126
#endif // ANDROID_NATIVE_WINDOW_H
131
0
127
132
=== added file '3rd_party/android-deps/android/rect.h'
133
--- 3rd_party/android-deps/android/rect.h	1970-01-01 00:00:00 +0000
134
+++ 3rd_party/android-deps/android/rect.h	2015-09-24 04:45:04 +0000
135
@@ -0,0 +1,41 @@
136
1
/*
137
2
 * Copyright (C) 2010 The Android Open Source Project
138
3
 *
139
4
 * Licensed under the Apache License, Version 2.0 (the "License");
140
5
 * you may not use this file except in compliance with the License.
141
6
 * You may obtain a copy of the License at
142
7
 *
143
8
 *      http://www.apache.org/licenses/LICENSE-2.0
144
9
 *
145
10
 * Unless required by applicable law or agreed to in writing, software
146
11
 * distributed under the License is distributed on an "AS IS" BASIS,
147
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
148
13
 * See the License for the specific language governing permissions and
149
14
 * limitations under the License.
150
15
 */
151
16
152
17
153
18
#ifndef ANDROID_RECT_H
154
19
#define ANDROID_RECT_H
155
20
156
21
#include <stdint.h>
157
22
158
23
#ifdef __cplusplus
159
24
extern "C" {
160
25
#endif
161
26
162
27
typedef struct ARect {
163
28
#ifdef __cplusplus
164
29
    typedef int32_t value_type;
165
30
#endif
166
31
    int32_t left;
167
32
    int32_t top;
168
33
    int32_t right;
169
34
    int32_t bottom;
170
35
} ARect;
171
36
172
37
#ifdef __cplusplus
173
38
};
174
39
#endif
175
40
176
41
#endif // ANDROID_RECT_H
177
0
42
178
=== modified file 'src/common/graphics/android/CMakeLists.txt'
179
--- src/common/graphics/android/CMakeLists.txt	2015-06-17 05:20:42 +0000
180
+++ src/common/graphics/android/CMakeLists.txt	2015-09-24 04:45:04 +0000
181
@@ -1,4 +1,5 @@
182
1
include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
1
include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
183
2
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
184
2
3
185
3
add_definitions( -DANDROID )
4
add_definitions( -DANDROID )
186
4
5
187
5
6
188
=== modified file 'src/platforms/android/client/CMakeLists.txt'
189
--- src/platforms/android/client/CMakeLists.txt	2015-07-21 04:30:03 +0000
190
+++ src/platforms/android/client/CMakeLists.txt	2015-09-24 04:45:04 +0000
191
@@ -1,5 +1,7 @@
192
1
include_directories(${client_common_include_dirs})
1
include_directories(${client_common_include_dirs})
193
2
include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
2
include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
194
3
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
195
4
196
3
add_definitions(-DANDROID)
5
add_definitions(-DANDROID)
197
4
6
198
5
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
7
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
199
6
8
200
=== modified file 'src/platforms/android/server/CMakeLists.txt'
201
--- src/platforms/android/server/CMakeLists.txt	2015-07-21 04:30:03 +0000
202
+++ src/platforms/android/server/CMakeLists.txt	2015-09-24 04:45:04 +0000
203
@@ -8,6 +8,7 @@
204
8
    ${GLESv2_INCLUDE_DIRS}
8
    ${GLESv2_INCLUDE_DIRS}
205
9
    ${ANDROID_PROPERTIES_INCLUDE_DIRS}
9
    ${ANDROID_PROPERTIES_INCLUDE_DIRS}
206
10
)
10
)
207
11
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
208
11
12
209
12
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
13
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
210
13
add_definitions( -DANDROID )
14
add_definitions( -DANDROID )
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-09-24
Daniel van Vugt		2015-09-24	Approve on 2015-09-24
Review via email: mp+272203@code.launchpad.net