Closed Bug 968631 Opened 7 years ago Closed 7 years ago

Port some LOCAL_INCLUDES variables to moz.build

Categories

(Firefox Build System :: General, defect)

x86
macOS
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla30

People

(Reporter: ehsan, Assigned: ehsan)

References

Details

Attachments

(1 file, 3 obsolete files)

No description provided.
Attachment #8371229 - Flags: review?(mh+mozilla)
Attachment #8371229 - Flags: review?(gps)
Note that I removed some of the LOCAL_INCLUDES which did not point to existing paths here.
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.
Attachment #8371229 - Flags: review?(mh+mozilla)
Attachment #8371229 - Flags: review?(gps)
Attachment #8371229 - Flags: review-
Attachment #8371237 - Flags: review?(mh+mozilla)
Attachment #8371229 - Attachment is obsolete: true
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
(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!
Attachment #8372710 - Flags: review?(mshal)
Attachment #8372710 - Flags: review?(mh+mozilla)
Attachment #8372710 - Flags: review?(gps)
Attachment #8371237 - Attachment is obsolete: true
Attachment #8371237 - Flags: review?(mh+mozilla)
Attachment #8372710 - Attachment is obsolete: true
Attachment #8372710 - Flags: review?(mshal)
Attachment #8372710 - Flags: review?(mh+mozilla)
Attachment #8372710 - Flags: review?(gps)
Attachment #8373011 - Flags: review?(mshal)
Attachment #8373011 - Flags: review?(mh+mozilla)
Attachment #8373011 - Flags: review?(gps)
Comment on attachment 8373011 [details] [diff] [review]
Port some LOCAL_INCLUDES variables to moz.build

Looks good to me!
Attachment #8373011 - Flags: review?(mshal)
Attachment #8373011 - Flags: review?(mh+mozilla)
Attachment #8373011 - Flags: review?(gps)
Attachment #8373011 - Flags: review+
https://hg.mozilla.org/mozilla-central/rev/db6c1f75a267
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla30
Depends on: 972459
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.