959912 - widget/gonk/libui/cutils_log.h doesn't compile

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Gonk, defect)

Comment 1

[Marco Chen [:mchen]]

Kai-Zhen will check it first.

Comment 2

[Kai-Zhen Li [:seinlin][:kli]]

Attachment: bug-959912-fix.patch

Both ANDROID_VERSION >= 19 and ANDROID_VERSION == 19 can work properly for gonk-kk.

Comment 3

[Kai-Zhen Li [:seinlin][:kli]]

Attachment: bug-959912-fix-2.patch

The duplicate typedef for gonk-kk need to be disabled.

Comment 4

[Kai-Zhen Li [:seinlin][:kli]]

Attachment: bug-959912-fix-2.patch

Hi, Michael, Can you help me have a look on this patch?

Comment 5

[Michael Wu [:mwu]]

Comment on attachment 8360258 [details] [diff] [review]
bug-959912-fix-2.patch

Review of attachment 8360258 [details] [diff] [review]:
-----------------------------------------------------------------

::: widget/gonk/libui/cutils_log.h
@@ +32,2 @@
>  #define _LIBS_CUTILS_LOG_H
> +#endif

I think we can just unconditionally define both things.

Comment 6

[Kai-Zhen Li [:seinlin][:kli]]

Do you mean something like this?
-----------------------------------------------------------------
-#ifndef _LIBS_CUTILS_LOG_H
+#if !defined(_LIBS_CUTILS_LOG_H) && !defined(_LIBS_LOG_LOG_H)
+#define _LIBS_LOG_LOG_H
 #define _LIBS_CUTILS_LOG_H

-----------------------------------------------------------------

Without the outer most check, unconditionally define both thing may build break with the following error.

In file included from ../../../gecko/widget/gonk/libui/InputWindow.cpp:21:0:
../../../gecko/widget/gonk/libui/cutils_log.h:481:22: error: conflicting declaration 'EVENT_TYPE_INT'
In file included from ../../../system/core/include/cutils/log.h:1:0,
                 from ../../../system/core/include/utils/Vector.h:24,
                 from ../../../gecko/widget/gonk/libui/Input.h:25,
                 from ../../../gecko/widget/gonk/libui/InputWindow.h:20,
                 from ../../../gecko/widget/gonk/libui/InputWindow.cpp:19:

Comment 7

[Michael Wu [:mwu]]

(In reply to Kai-Zhen Li from comment #6)
> Do you mean something like this?
> -----------------------------------------------------------------
> -#ifndef _LIBS_CUTILS_LOG_H
> +#if !defined(_LIBS_CUTILS_LOG_H) && !defined(_LIBS_LOG_LOG_H)
> +#define _LIBS_LOG_LOG_H
>  #define _LIBS_CUTILS_LOG_H
> 
> -----------------------------------------------------------------
> 

That works for me here. What kind of build are you testing on?

Comment 8

[Kai-Zhen Li [:seinlin][:kli]]

OK, I'll submit a new patch ringht now.

It also work for me. I mean if unconditionally define without this line will build break.

#if !defined(_LIBS_CUTILS_LOG_H) && !defined(_LIBS_LOG_LOG_H)

Comment 9

[Kai-Zhen Li [:seinlin][:kli]]

Attachment: bug-959912-fix-3.patch

Comment 10

[Michael Wu [:mwu]]

Comment on attachment 8360311 [details] [diff] [review]
bug-959912-fix-3.patch

Review of attachment 8360311 [details] [diff] [review]:
-----------------------------------------------------------------

Might need to double check that this works on other versions.

Comment 11

[Kai-Zhen Li [:seinlin][:kli]]

Try result: https://tbpl.mozilla.org/?tree=Try&rev=8b9021034987

Comment 12

[Marco Chen [:mchen]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2312b12fbf04

Comment 13

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/2312b12fbf04