Closed Bug 973388 Opened 6 years ago Closed 6 years ago

Move the LOCAL_INCLUDES in xpcom to moz.build

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla30

People

(Reporter: Ehsan, Assigned: Ehsan)

References

Details

Attachments

(1 file)

No description provided.
Assignee: nobody → ehsan
Attachment #8376880 - Flags: review?(mshal)
Attachment #8376880 - Flags: review?(mh+mozilla)
Attachment #8376880 - Flags: review?(gps)
Comment on attachment 8376880 [details] [diff] [review]
Move the LOCAL_INCLUDES in xpcom to moz.build

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

r+ with the following fixed.

::: xpcom/build/moz.build
@@ +81,5 @@
>      DEFINES['MOZ_OPTIMIZE'] = True
> +
> +GENERATED_INCLUDES += ['..']
> +LOCAL_INCLUDES += [
> +    '..',

There are no headers in $topsrcdir/xpcom/. We don't need this.

::: xpcom/typelib/xpt/src/moz.build
@@ +14,5 @@
>  
>  FINAL_LIBRARY = 'xpcom_core'
> +
> +GENERATED_INCLUDES += [
> +    '../../..',

There are only two generated headers in $objdir/xpcom: xpcom-config.h and xpcom-private.h. The former is in dist/include, which means it's already in the include path, and the latter is not included directly or indirectly from sources in xpcom/typelib/xpt/src.

@@ +15,5 @@
>  FINAL_LIBRARY = 'xpcom_core'
> +
> +GENERATED_INCLUDES += [
> +    '../../..',
> +    '../../../base',

/xpcom/base is shorter and less ambiguous.
Attachment #8376880 - Flags: review?(mshal)
Attachment #8376880 - Flags: review?(mh+mozilla)
Attachment #8376880 - Flags: review?(gps)
Attachment #8376880 - Flags: review+
https://hg.mozilla.org/mozilla-central/rev/368275eecfba
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla30
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.