Nidium/patch/angle_android.patch at master · nidium/Nidium · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
# Various changes in gyp files to support building android version
--- angle/build/standalone.gypi
+++ angle/build/standalone.gypi
@@ -23,7 +23,7 @@
             },
             'conditions':
             [
-                ['OS=="linux" and use_ozone==0',
+                ['OS=="linux" and use_ozone==0 and is_android==0',
                 {
                     'use_x11': 1,
                 },

--- angle/src/libGLESv2.gypi
+++ angle/src/libGLESv2.gypi
@@ -867,6 +867,23 @@
                                 ],
                             },
                         }],
+                        ['is_android==1',
+                        {
+                            'sources':
+                            [
+                                '<@(libangle_gl_egl_sources)',
+                                '<@(libangle_gl_egl_dl_sources)',
+                                '<@(libangle_gl_egl_android_sources)',
+                            ],
+                            #'link_settings': {
+                            #    'ldflags': [
+                            #        '<!@(<(pkg-config) --libs-only-L --libs-only-other libdrm gbm)',
+                            #    ],
+                            #    'libraries': [
+                            #        '<!@(<(pkg-config) --libs-only-l libdrm gbm) -ldl',
+                            #    ],
+                            #},
+                        }],
                         ['use_ozone==1',
                         {
                             'defines':

--- angle/util/util.gyp
+++ angle/util/util.gyp
@@ -164,6 +164,21 @@
                         ],
                     },
                 }],
+                ['is_android==1',
+                {
+                    'sources':
+                    [
+                        '<@(util_android_sources)',
+                    ],
+                    'link_settings':
+                    {
+                        'libraries':
+                        [
+                            '-landroid',
+                            '-llog',
+                        ],
+                    },
+                }],
                 ['use_x11==1',
                 {
                     'sources':