bug 883350: move SDK_HEADERS to mozbuild r=mshal
authorJoey Armstrong <joey@mozilla.com>
Tue, 24 Sep 2013 12:17:26 -0400
changeset 162275 726355fba9b6ad2e2ccebeaef8f1b285fd8206e5
parent 162274 8bb6158620998e4281e95abc78ee39b2e8915f92
child 162276 2f924314efe888f29785dd9bbb49e2451662662d
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs883350
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 883350: move SDK_HEADERS to mozbuild r=mshal
config/rules.mk
js/src/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -34,16 +34,17 @@ INCLUDED_RULES_MK = 1
   IS_COMPONENT \
   JS_MODULES_PATH \
   LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \
   MSVC_ENABLE_PGO \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
+  SDK_HEADERS \
   SIMPLE_PROGRAMS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPCSHELL_TESTS \
   XPIDL_MODULE \
   $(NULL)
 
@@ -100,21 +101,16 @@ ifndef L10NBASEDIR
 ifndef .PYMAKE
 $(error Pymake is required to build on Windows. Run |./mach build| to \
 automatically use pymake or invoke pymake directly via \
 |python build/pymake/make.py|.)
 endif
 endif
 endif
 
-ifdef SDK_HEADERS
-_EXTRA_EXPORTS := $(filter-out $(EXPORTS),$(SDK_HEADERS))
-EXPORTS += $(_EXTRA_EXPORTS)
-endif
-
 ifdef REBUILD_CHECK
 ifdef .PYMAKE
 REPORT_BUILD = @%rebuild_check rebuild_check $@ $^
 else
 REPORT_BUILD = $(info $(shell $(PYTHON) $(MOZILLA_DIR)/config/rebuild_check.py $@ $^))
 endif
 else
 REPORT_BUILD = $(info $(notdir $@))
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -34,16 +34,17 @@ INCLUDED_RULES_MK = 1
   IS_COMPONENT \
   JS_MODULES_PATH \
   LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \
   MSVC_ENABLE_PGO \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
+  SDK_HEADERS \
   SIMPLE_PROGRAMS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPCSHELL_TESTS \
   XPIDL_MODULE \
   $(NULL)
 
@@ -100,21 +101,16 @@ ifndef L10NBASEDIR
 ifndef .PYMAKE
 $(error Pymake is required to build on Windows. Run |./mach build| to \
 automatically use pymake or invoke pymake directly via \
 |python build/pymake/make.py|.)
 endif
 endif
 endif
 
-ifdef SDK_HEADERS
-_EXTRA_EXPORTS := $(filter-out $(EXPORTS),$(SDK_HEADERS))
-EXPORTS += $(_EXTRA_EXPORTS)
-endif
-
 ifdef REBUILD_CHECK
 ifdef .PYMAKE
 REPORT_BUILD = @%rebuild_check rebuild_check $@ $^
 else
 REPORT_BUILD = $(info $(shell $(PYTHON) $(MOZILLA_DIR)/config/rebuild_check.py $@ $^))
 endif
 else
 REPORT_BUILD = $(info $(notdir $@))