I thought this would be trivial but it's turning into a tar baby. Fighting some C++ includes right now. The toolchain produced from this work won't be publicly publishable (sigh), so we'll have to choose how the bits are pushed around. It's fine for them to live on mozilla servers that aren't publicly accessibly (like OS X, windows, etc.).

Could do a PR, but this is mostly to exchange information for now. This could land upstream a month from now.

The includes from stlport/ conflict with some from ndk/. We need to include some of the stlport dirs directly, but we also need jni.h for the omx code here, which is brought in through ndk/. It's not wise to let ndk and stlport fight over their headers, so instead we just directly include what we need. There's no reason a priori that the stlport directory layout would change more than the ndk's. This patch should allow both versions of the toolchain to work until we move to the new one.

Could you explain what this bug actually means?

We need to build a new toolchain to support building OMX-decoder-built-into-gecko (bug 759506). Unfortunately, this also requires a gecko patch.

I confirmed with the patch here, m-c builds without bug 759506, and with the new toolchain applied it also builds.

Update to toolchain script landed as https://github.com/mozilla-b2g/B2G/commit/ef94806c26af676c296884cc6732cb665800b1f1 and the configure.in patch to support both versions landed as https://hg.mozilla.org/integration/mozilla-inbound/rev/3dfca392c32b

Pointing at new b2g-toolchain on mozilla-central: https://hg.mozilla.org/mozilla-central/rev/bb0d5695896d Green on try