Skip to content

Commit f462b39

Browse files
committed
app: support C compiler that defaults to -fno-common
For the Android NDK, between r21 and r22 the NDK compiler switched the default from "-fcommon" to "-fno-common", which causes duplicate definitions when building the examples given the current C code. To fix things, rework the C code to insure that we have a single definition and an "extern" reference to the objects in question. Updates golang/go#44121. Change-Id: If198d5cfd977a7cfd1a37652d3a1916d8c8dbcb7 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/290031 Run-TryBot: Than McIntosh <thanm@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com> Trust: Than McIntosh <thanm@google.com>
1 parent e4a08af commit f462b39

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/android.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ package app
3535
#include <pthread.h>
3636
#include <stdlib.h>
3737
38-
EGLDisplay display;
39-
EGLSurface surface;
38+
extern EGLDisplay display;
39+
extern EGLSurface surface;
40+
4041
4142
char* createEGLSurface(ANativeWindow* window);
4243
char* destroyEGLSurface();

0 commit comments

Comments
 (0)