973388 - Move the LOCAL_INCLUDES in xpcom to moz.build

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Comment 1

[(no longer active)]

Attachment: Move the LOCAL_INCLUDES in xpcom to moz.build

Comment 2

[Mike Hommey [:glandium]]

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.

Comment 3

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/368275eecfba

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/368275eecfba