968631 - Port some LOCAL_INCLUDES variables to moz.build

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Comment 1

[(no longer active)]

Attachment: Port some LOCAL_INCLUDES variables to moz.build

Comment 2

[(no longer active)]

Note that I removed some of the LOCAL_INCLUDES which did not point to existing paths here.

Comment 3

[(no longer active)]

https://tbpl.mozilla.org/?tree=Try&rev=e9709db2a4a4

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8371229 [details] [diff] [review]
Port some LOCAL_INCLUDES variables to moz.build

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

::: hal/moz.build
@@ +184,5 @@
> +
> +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
> +    # So that we can call nsScreenManagerGonk::GetConfiguration().
> +    LOCAL_INCLUDES += [
> +        CONFIG['ANDROID_SOURCE'] + 'hardware/libhardware_legacy/include',

This is unlikely to work, as ANDROID_SOURCE is outside the source directory.

Comment 5

[(no longer active)]

Attachment: Port some LOCAL_INCLUDES variables to moz.build

Comment 6

[(no longer active)]

b2g: https://tbpl.mozilla.org/?tree=Try&rev=2e5debebebbd

Comment 7

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Comment on attachment 8371237 [details] [diff] [review]
Port some LOCAL_INCLUDES variables to moz.build

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

::: hal/Makefile.in
@@ +8,5 @@
>  CFLAGS          += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
>  CXXFLAGS        += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
>  
>  ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
> +  LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include

I've put those into CXXFLAGS elsewhere

Comment 8

[(no longer active)]

(In reply to :Ms2ger from comment #7)
> Comment on attachment 8371237 [details] [diff] [review]
> Port some LOCAL_INCLUDES variables to moz.build
> 
> Review of attachment 8371237 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: hal/Makefile.in
> @@ +8,5 @@
> >  CFLAGS          += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
> >  CXXFLAGS        += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
> >  
> >  ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
> > +  LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include
> 
> I've put those into CXXFLAGS elsewhere

We'll have to deal with that when moving CXXFLAGS then.  The important thing here is that we need to have a solution before we can build libxul from moz.build.  I don't particularly care where the remaining stuff live in the mean time!

Comment 9

[(no longer active)]

Attachment: Port some LOCAL_INCLUDES variables to moz.build

Comment 10

[(no longer active)]

Attachment: Port some LOCAL_INCLUDES variables to moz.build

Comment 11

[(no longer active)]

https://tbpl.mozilla.org/?tree=Try&rev=70344797a94f

Comment 12

[Michael Shal [:mshal]]

Comment on attachment 8373011 [details] [diff] [review]
Port some LOCAL_INCLUDES variables to moz.build

Looks good to me!

Comment 13

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/db6c1f75a267

Comment 14

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/db6c1f75a267