nsXREDirProvider breaks Orfox

toolkit/xre/nsXREDirProvider.cpp breaks the Orfox build with the error attached to this ticket.

added TorBrowserTeam201607 component::applications/tor browser owner::tbb-team priority::medium resolution::invalid severity::normal status::closed tbb-mobile type::defect labels

Trac:
error.txt

Which commit/branch are you building from?

tor-browser-45.2.0esr-6.5-1-build1. Last commit from the tbb team: b60b8871fa08feaaca24bcf6dff43df0cd1c5f29 Regression tests for Bug 1517: Reduce precision of time for Javascript.

Trac:
Keywords: N/A deleted, TorBrowserTeam201607 added

Kathy Brade and I looked at this but were unable to find the problem (we do not have an Android build environment). Is there any chance you can provide a patch?

Also, that file may need more work for Android. For example, nsXREDirProvider::AppendSysUserExtensionPath() has this:

#else
#error "Don't know how to get XRE user extension path on your platform"
#endif

I do not know which macros are defined when building for Android. I assume ANDROID is defined but what about XP_UNIX and MOZ_WIDGET_GONK?

Trac:
Status: new to needs_information

Looks like there is an #endif missing. I might be counting wrong though, please verify.

Here's the patch that works for android.

Trac:
xredir.patch

Replying to amoghbl1:

Looks like there is an #endif missing. I might be counting wrong though, please verify.

Here's the patch that works for android.

Thanks. But when I apply that patch I see:

 In file included from /Users/brade/dev/tor/tor-browser/obj-macos/toolkit/xre/Unified_cpp_toolkit_xre0.cpp:65:
/Users/brade/dev/tor/tor-browser/toolkit/xre/nsXREDirProvider.cpp:1229:2: error: 
      #endif without #if
#endif

I am still not seeing the same thing you are. Please attach the entire contents of your toolkit/xre/nsXREDirProvider.cpp

Trac:
nsXREDirProvider.cpp

I've attached the nsXREDirProvider file along with a few spelling mistakes in comments because the trac was blocking it with it's spam filters.

Replying to amoghbl1:

I've attached the nsXREDirProvider file along with a few spelling mistakes in comments because the trac was blocking it with it's spam filters.

That file is not the same as the tor-browser-45.2.0esr-6.5-1-build1 file, which is this one: https://gitweb.torproject.org/tor-browser.git/plain/toolkit/xre/nsXREDirProvider.cpp?id=b60b8871fa08feaaca24bcf6dff43df0cd1c5f29

It looks like you (or someone) backed out portions of various Tor Browser commits. Do you know why that was done? If changes are necessary, we should find a way to make them with #ifdef's so that the same file can be used by Orfox and Tor Browser. I think the compile error is caused by changes made during the backout process, although it is difficult to be certain without know what was backed out and why.

I'm sorry. Looks like this is my mistake. I seem to have missed this during the rebase process.

Trac:
Resolution: N/A to invalid
Status: needs_information to closed

closed

moved to tpo/applications/tor-browser#19532 (closed)