Skip to content

Commit

Permalink
Merge commit '8d0205cf10faaeb4e6c6e303c73b3f5a1e9919f5' into embedlite
Browse files Browse the repository at this point in the history 
Conflicts:
	build/gyp.mozbuild
	gfx/cairo/cairo/src/moz.build
	media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_device_info_null.cc
  • Loading branch information
@tmeshkova
tmeshkova committed Aug 7, 2014
2 parents 234dc9d + 8d0205c commit 1611e1b
Show file tree
Hide file tree
Showing 1,676 changed files with 46,518 additions and 38,859 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
View file
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1046585 moved files to a different directory and required a clobber.
Bug 1046533 needs a clobber on Android.
4 changes: 2 additions & 2 deletions accessible/base/AccEvent.h
View file
Expand Up @@ -291,7 +291,7 @@ class AccShowEvent: public AccMutationEvent
class AccReorderEvent : public AccEvent
{
public:
AccReorderEvent(Accessible* aTarget) :
explicit AccReorderEvent(Accessible* aTarget) :
AccEvent(::nsIAccessibleEvent::EVENT_REORDER, aTarget,
eAutoDetect, eCoalesceReorder) { }
virtual ~AccReorderEvent() { }
Expand Down Expand Up @@ -499,7 +499,7 @@ class AccVCChangeEvent : public AccEvent
class downcast_accEvent
{
public:
downcast_accEvent(AccEvent* e) : mRawPtr(e) { }
explicit downcast_accEvent(AccEvent* e) : mRawPtr(e) { }

template<class Destination>
operator Destination*() {
Expand Down
2 changes: 1 addition & 1 deletion accessible/generic/Accessible.h
View file
Expand Up @@ -96,7 +96,7 @@ struct GroupPos
class index_t
{
public:
index_t(int32_t aVal) : mVal(aVal) {}
MOZ_IMPLICIT index_t(int32_t aVal) : mVal(aVal) {}

operator uint32_t() const
{
Expand Down
2 changes: 0 additions & 2 deletions accessible/interfaces/ia2/Makefile.in
View file
Expand Up @@ -61,8 +61,6 @@ midl_TARGET := export

include $(topsrcdir)/config/rules.mk

OS_LIBS += $(call EXPAND_LIBNAME,uuid kernel32 rpcns4 rpcrt4 ole32 oleaut32)

# generate list of to-be-generated files that are missing
# but ignore special file dlldata.c
missing:=$(strip $(foreach onefile,$(strip $(subst dlldata.c,,$(MIDL_GENERATED_FILES))),$(if $(wildcard $(onefile)),,$(onefile))))
Expand Down
9 changes: 9 additions & 0 deletions accessible/interfaces/ia2/moz.build
View file
Expand Up @@ -11,3 +11,12 @@ FORCE_SHARED_LIB = True
DEFINES['REGISTER_PROXY_DLL'] = True

DEFFILE = SRCDIR + '/IA2Marshal.def'

OS_LIBS += [
'uuid',
'kernel32',
'rpcns4',
'rpcrt4',
'ole32',
'oleaut32',
]
2 changes: 0 additions & 2 deletions accessible/interfaces/msaa/Makefile.in
View file
Expand Up @@ -16,8 +16,6 @@ MIDL_GENERATED_FILES = \
ISimpleDOMText_i.c \
$(NULL)

OS_LIBS += $(call EXPAND_LIBNAME,kernel32 rpcns4 rpcrt4 oleaut32)

$(MIDL_GENERATED_FILES): done_gen

done_gen: ISimpleDOMNode.idl \
Expand Down
7 changes: 7 additions & 0 deletions accessible/interfaces/msaa/moz.build
View file
Expand Up @@ -21,3 +21,10 @@ FORCE_SHARED_LIB = True
DEFINES['REGISTER_PROXY_DLL'] = True

DEFFILE = SRCDIR + '/AccessibleMarshal.def'

OS_LIBS += [
'kernel32',
'rpcns4',
'rpcrt4',
'oleaut32',
]
3 changes: 2 additions & 1 deletion accessible/mac/mozHTMLAccessible.mm
View file
Expand Up @@ -17,9 +17,10 @@ @implementation mozHeadingAccessible
- (NSString*)title
{
nsAutoString title;
mozilla::ErrorResult rv;
// XXX use the flattening API when there are available
// see bug 768298
mGeckoAccessible->GetContent()->GetTextContent(title);
mGeckoAccessible->GetContent()->GetTextContent(title, rv);

return nsCocoaUtils::ToNSString(title);
}
Expand Down
31 changes: 0 additions & 31 deletions b2g/app/Makefile.in
View file
Expand Up @@ -7,37 +7,6 @@ include $(topsrcdir)/config/makefiles/rcs.mk

PREF_JS_EXPORTS = $(srcdir)/b2g.js

ifndef LIBXUL_SDK

ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += \
-lui \
-lEGL \
-lhardware_legacy \
-lhardware \
-lcutils \
$(MOZ_ZLIB_LIBS) \
$(NULL)
ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),17 18 19))
OS_LIBS += \
-lgui \
-lsuspend \
$(NULL)
endif
endif

ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += \
-lbinder \
-lutils \
$(NULL)
endif

ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,version)
endif
endif #LIBXUL_SDK

UA_UPDATE_FILE = ua-update.json

$(UA_UPDATE_FILE): % : %.in
Expand Down
23 changes: 23 additions & 0 deletions b2g/app/moz.build
View file
Expand Up @@ -58,8 +58,31 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
'mozz',
]

OS_LIBS += [
'ui',
'EGL',
'hardware_legacy',
'hardware',
'cutils',
]
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
if CONFIG['ANDROID_VERSION'] in ('17', '18', '19'):
OS_LIBS += [
'gui',
'suspend',
]
OS_LIBS += [
'binder',
'utils',
]

USE_LIBS += [
'xpcomglue',
]

DISABLE_STL_WRAPPING = True

if CONFIG['OS_ARCH'] == 'WINNT':
OS_LIBS += [
'version',
]
6 changes: 3 additions & 3 deletions b2g/config/emulator-ics/sources.xml
View file
Expand Up @@ -19,12 +19,12 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="5fd14b8bc428f87f9b5cf9cc49f9a4f362a970fb"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d61daef8fca7d6f335f659a8967bad423770e634"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="079c5f85875b0f2eb341ca9fd375f1b905ed7157"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cff8f990433810780088c545641c3110d956949f"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="227354333a185180b85471f2cc6abfb029e44718"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
Expand Down
10 changes: 6 additions & 4 deletions b2g/config/emulator-jb/sources.xml
View file
Expand Up @@ -17,9 +17,9 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5fd14b8bc428f87f9b5cf9cc49f9a4f362a970fb"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d61daef8fca7d6f335f659a8967bad423770e634"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="079c5f85875b0f2eb341ca9fd375f1b905ed7157"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cff8f990433810780088c545641c3110d956949f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
Expand Down Expand Up @@ -70,6 +70,7 @@
<project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="8bf95c739da6c60a08b07297a1d7b996d51fd53b"/>
<project name="platform/external/libnl-headers" path="external/libnl-headers" revision="7bd0b8345c96344746541e8f39375226bf580c41"/>
<project name="platform/external/libogg" path="external/libogg" revision="6b0f05807a0e117bd774029a2b84e95ac1254353"/>
<project name="platform/external/libpcap" path="external/libpcap" revision="7db9ecfdf0d68c5000dbbaf8d96b0ff11d98a7fd"/>
<project name="platform_external_libpng" path="external/libpng" remote="b2g" revision="5f020432161cfde3d66aa4879b1d216a1f093303"/>
<project name="platform/external/libselinux" path="external/libselinux" revision="fafd3f40d5185ddb99a47fe951a60c8c5d9eece2"/>
<project name="platform/external/libsepol" path="external/libsepol" revision="986b9a21757ebbd9c18a00a8b09d495b9681d6e1"/>
Expand All @@ -92,6 +93,7 @@
<project name="platform/external/strace" path="external/strace" revision="1714f1f9abf2237901b4c5d80955a3556d355c60"/>
<project name="platform/external/svox" path="external/svox" revision="65c756ac5edc78493d8597b865362015c1a6b6e9"/>
<project name="platform/external/tagsoup" path="external/tagsoup" revision="6fdb4dfecc14d4634479bb544b0badf1eb58df92"/>
<project name="platform/external/tcpdump" path="external/tcpdump" revision="75a7b633f60026f8d371e18e9127015990656b12"/>
<project name="platform/external/tinyalsa" path="external/tinyalsa" revision="a6e1da53a63cc2b676ee75a97a5953531fafa27a"/>
<project name="platform/external/tinyxml" path="external/tinyxml" revision="ed2c5fc8937f8225ec6fd94ebcabac65621a2dc8"/>
<project name="platform/external/tinyxml2" path="external/tinyxml2" revision="f5549cc02ee15888ecc31cf85b346578260975f9"/>
Expand Down Expand Up @@ -131,7 +133,7 @@
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="683623c76338dccd65e698bfb5c4cfee8808d799"/>
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9f28c4faea3b2f01db227b2467b08aeba96d9bec"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="b6f025acd8ead1c3531e1ad62e70849161ed9340"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="02104803f873a4d5cf9fb611a211b83450e9dfba"/>
<project name="android-sdk" path="sdk" remote="b2g" revision="8b1365af38c9a653df97349ee53a3f5d64fd590a"/>
<project name="darwinstreamingserver" path="system/darwinstreamingserver" remote="b2g" revision="cf85968c7f85e0ec36e72c87ceb4837a943b8af6"/>
</manifest>
10 changes: 6 additions & 4 deletions b2g/config/emulator-kk/sources.xml
View file
Expand Up @@ -12,14 +12,14 @@
<!--original fetch url was https://git.mozilla.org/releases-->
<remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
<!-- B2G specific things. -->
<project name="platform_build" path="build" remote="b2g" revision="999e945b85c578c503ad445c2285940f16aacdae">
<project name="platform_build" path="build" remote="b2g" revision="7945ca73e687be5edbc7b928dc7fe3a208242144">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="5fd14b8bc428f87f9b5cf9cc49f9a4f362a970fb"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="079c5f85875b0f2eb341ca9fd375f1b905ed7157"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d61daef8fca7d6f335f659a8967bad423770e634"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cff8f990433810780088c545641c3110d956949f"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
Expand Down Expand Up @@ -69,6 +69,7 @@
<project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="06209143852be5967c67eb7675d80ea6250c6487"/>
<project name="platform/external/libnl-headers" path="external/libnl-headers" revision="35499a49e8475844a1ea4f7d17cef7c6ebb85051"/>
<project name="platform/external/libogg" path="external/libogg" revision="b33f5501cc0ef62a776f1223ede90beacb54ffa3"/>
<project name="platform/external/libpcap" path="external/libpcap" revision="b8abe0f4ea706357680930f86fdd6cd26bf30b31"/>
<project name="platform/external/libpng" path="external/libpng" revision="e79b02c09f131d26a4b95d025fe85f3e0bd87a55"/>
<project name="platform/external/libselinux" path="external/libselinux" revision="f2a93748f1974a76f1676f66049b3a29f1b4e532"/>
<project name="platform/external/libsepol" path="external/libsepol" revision="cf9b75ee1949969c6620fcbec854e67a305dbbc7"/>
Expand All @@ -91,6 +92,7 @@
<project name="platform/external/strace" path="external/strace" revision="df60312a98c0cdb419d130a454bd5f3190ee6a16"/>
<project name="platform/external/svox" path="external/svox" revision="1cc8a28a4089b0a2041c4077e917e5964dd10e4d"/>
<project name="platform/external/tagsoup" path="external/tagsoup" revision="ab78ce1be9f67f787282796f8accc7d50a2fb051"/>
<project name="platform/external/tcpdump" path="external/tcpdump" revision="c76d00f367d39014256d478aa917f57f6424d455"/>
<project name="platform/external/tinyalsa" path="external/tinyalsa" revision="4b3f554e49d94a41276dddcc1a11fa0442c2044b"/>
<project name="platform/external/tinycompress" path="external/tinycompress" revision="4ef0577bf643bc5ae8168015d2a0aa437d165564"/>
<project name="platform/external/tinyxml" path="external/tinyxml" revision="2a1ec6642c9f7672d9681ebb3f3a313fd07076ce"/>
Expand Down
6 changes: 3 additions & 3 deletions b2g/config/emulator/sources.xml
View file
Expand Up @@ -19,12 +19,12 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="5fd14b8bc428f87f9b5cf9cc49f9a4f362a970fb"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d61daef8fca7d6f335f659a8967bad423770e634"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="079c5f85875b0f2eb341ca9fd375f1b905ed7157"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cff8f990433810780088c545641c3110d956949f"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="227354333a185180b85471f2cc6abfb029e44718"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="71f5a35e3bc1801847413cff1f14fc3b5cd991ca"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
Expand Down

0 comments on commit 1611e1b

Please sign in to comment.