Build Orbot with rbm/tor-browser-build

added TBA-a2 TorBrowserTeam201811R component::applications/tor browser owner::tbb-team parent::26693 priority::very high resolution::fixed severity::normal sponsor::8 status::closed tbb-mobile tbb-rbm type::defect labels

Moving our tickets to November.

Trac:
Keywords: TorBrowserTeam201810 deleted, TorBrowserTeam201811 added

Moving on TBA-a2 radar

Trac:
Keywords: N/A deleted, TBA-a2 added

Where is the orbot repo we want to pull from?

Changes (android-1112)

android-toolchain: Add android platform library and build tools 27. Used by Orbot
android-toolchain: added exports to match what orbot uses (these are standard names)
orbot: compile native library with NDK, build app with gradle

I know this is incomplete but just want to push an early version for comments. The follow are incomplete

Need to add gradle dependency list similar to firefox project. Currently its pulling everything down as part of build
Need to add packaging
Add patch from sysrqb to turn from app project to library project(s)

Notes:

Orbot uses API 27 libraries to build. When we integrate with firefox, we can configure to use 26. This MAY be incompatible if Orbot it using features that are API 27 specific. In this case we need to either remove those 27 features for Orbot OR upgrade firefox to use API 27 libraries.
Orbot uses gradle 4.4, while firefox uses gradle 4.1. After testing, Orbot compiles fine with gradle 4.4 so its not using 4.4 specific configurations
We need to disable running lint on the Orbot build since this flags 1100 issues and fails the build. Fixing these would be way out of scope for an rbm build.

I need another day to get the remaining issues in. That will leave 3 days this week to try to complete integration with firefox and work out those issues.

Trac:
Cc: sisbell to sisbell, sysrqb

Where come the required libraries like OpenSSL into play? I expected seeing the openssl project being a dependency of the orbot project in its config.

Replying to gk:

Where come the required libraries like OpenSSL into play? I expected seeing the openssl project being a dependency of the orbot project in its config.

This is handled by https://github.com/n8fr8/tor-android which is pulled as a gradle dependency in orbot. tor-android project handles building of tor, openssl and libevent for android. If we need to build these libraries and use them through config, it will also require pulling down and configuring the tor-android project and patching it. Is this the way you are looking at going? Or is prebuilt gradle dependency good for now?

Changes (android-1113)

Added gradle dependencies to list (similar to firefox)
Upgrade gradle to 4.4 (it appears there is one plugin that needs 4.4)
Added sysrqb patch
Add patch to point to our maven repo for gradle dependencies
Copy aar files to distribution directory

For some reason jsocksAndroid is not building as part of standard build so I need to modify script for that. Also need some cleanup of the config regarding the git repo.

Replying to sisbell:

Replying to gk:

Where come the required libraries like OpenSSL into play? I expected seeing the openssl project being a dependency of the orbot project in its config.

This is handled by https://github.com/n8fr8/tor-android which is pulled as a gradle dependency in orbot. tor-android project handles building of tor, openssl and libevent for android. If we need to build these libraries and use them through config, it will also require pulling down and configuring the tor-android project and patching it. Is this the way you are looking at going? Or is prebuilt gradle dependency good for now?

We should do that, yes, but maybe not now due to time constraints. So, I think the prebuilt gradle dependency is good for now but we should fix that before the next major alpha release.

Replying to sisbell:

Changes (android-1113)

Added gradle dependencies to list (similar to firefox)

Instead of duplicating the fetch-gradle-dependencies script, I think you can move it to projects/common/fetch-gradle-dependencies, and replace the path to the dependencies list (currently '/projects/orbot/gradle-dependencies-list.txt') by '/projects/' _ project _ '/gradle-dependencies-list.txt'.

Replying to sisbell:

Changes (android-1113)

Added gradle dependencies to list (similar to firefox)

Upgrade gradle to 4.4 (it appears there is one plugin that needs 4.4)

I tried igt0's patch for #25013 (moved) on top of that today and suddenly the Firefox build is busted. It's failing in the configure script complaining that gradle needs to be executable.

I have not looked closer at the commit but I suspect that's just caused by bumping the gradle version? That said, looking at the changes to the android-toolchain project: what's the reason for --api 16 now instead of --api 26 or is that a typo?

There are three new trailing whitespaces in the changes to projects/android-toolchain/config, too.

Replying to sisbell:

Changes (android-1112)

android-toolchain: Add android platform library and build tools 27. Used by Orbot

We can decrease Orbot's build-tools to 26.

I don't want to introduce more changes in how we build fennec than absolutely necessary - we're already walking a delicate line with maintaining a (mostly) unsupported codebase for mobile.

android-toolchain: added exports to match what orbot uses (these are standard names)

orbot: compile native library with NDK, build app with gradle

nit: In projects/orbot/build, you can use pushd/popd when building the libraries and then returning to the root project dir.

I know this is incomplete but just want to push an early version for comments. The follow are incomplete

Need to add gradle dependency list similar to firefox project. Currently its pulling everything down as part of build

Need to add packaging

Add patch from sysrqb to turn from app project to library project(s)

Notes:

Orbot uses API 27 libraries to build. When we integrate with firefox, we can configure to use 26. This MAY be incompatible if Orbot it using features that are API 27 specific. In this case we need to either remove those 27 features for Orbot OR upgrade firefox to use API 27 libraries.

Right, this is a problem. We have two choices, and I don't particularly like either of them. Orbot doesn't need API 27 support, API 26 is sufficient. However, we have a problem with the Android Support Library version it uses.

Orbot uses notifications (the message in the drop-down menu at the top) for showing information about Orbot's current state. We can take advantage of this by giving TBA users a way to open TBA's Orbot and configure it. The UX-flow is a little weird, and we can improve on it, but I think the notification is very helpful. However, this is only available beginning with the Android support library version 26.1.0. Orbot compiles and runs without a problem when its compiled against version 26.1.0, so we can make this change easily. However, Fennec uses version 23.4.0. Unfortunately, version 23.4.0 can't create notifications on new versions of Android (Android O added a new "Channel ID" attribute, and setting this is a requirement of all notifications, but there isn't a way to set it when we use an Android Support Library less than 26.1.0). It gets better because between version 23.4.0 and 26.1.0, Android changed the name of some built-in images (Material Design resources), so Fennec doesn't compile against Support library 26.1.0 (without patching Fennec for the name change). With all this being said:

We can downgrade the version of the support library Orbot depends on, and lose Notifications on Android O (and later version)
We can upgrade the version Fennec depends on and add a patch that changes the resource names.

Losing the notifications is the less risky path, but I think our UX will suffer as a result.

Replying to sisbell:

Changes (android-1113)

Upgrade gradle to 4.4 (it appears there is one plugin that needs 4.4) Do you know which plugin is needed? Can we disable/remove it?

For some reason jsocksAndroid is not building as part of standard build so I need to modify script for that. Also need some cleanup of the config regarding the git repo.

I use ./gradlew assembleRelease for building the three AARs.

Replying to sysrqb:

Replying to sisbell:

Changes (android-1113)

Upgrade gradle to 4.4 (it appears there is one plugin that needs 4.4)

Do you know which plugin is needed? Can we disable/remove it?

I get the following failure.

Failed to apply plugin [id 'com.android.library'] Minimum supported Gradle version is 4.4. Current version is 4.1. If using the gradle wrapper, try editing the distributionUrl in /var/tmp/build/orbot-f06939b6f8c0/gradle/wrapper/gradle-wrapper.properties to gradle-4.4-all.zip

This is because of the version of the plugin that orbot uses: com.android.tools.build:gradle:3.1.4. If we downgrade the plugin to 3.0 we can use gradle 4.1. I'll test it out and see if that works.

Replying to sysrqb:

Replying to sisbell:

Changes (android-1113)

For some reason jsocksAndroid is not building as part of standard build so I need to modify script for that. Also need some cleanup of the config regarding the git repo.

I use ./gradlew assembleRelease for building the three AARs.

There shouldn't be a difference between calling bin/gradle and the gradlew. So I'll need to investigate the jsocksAndroid issue further. As a note, gradlew is using a 4.4 wrapper. If we decide to go with gradle 4.1, we can either patch gradle-wrapper.properties to 4.1 OR use bin/gradle (for 4.1) directly.

Replying to gk:

Replying to sisbell:

Changes (android-1113)

Added gradle dependencies to list (similar to firefox)

Upgrade gradle to 4.4 (it appears there is one plugin that needs 4.4)

I tried igt0's patch for #25013 (moved) on top of that today and suddenly the Firefox build is busted. It's failing in the configure script complaining that gradle needs to be executable.

I have not looked closer at the commit but I suspect that's just caused by bumping the gradle version? That said, looking at the changes to the android-toolchain project: what's the reason for --api 16 now instead of --api 26 or is that a typo?

I should add in a comment in build file to explain this line. This is assembling the NDK build tools for API 16. Our minSdkVersion is also 16, meaning this is the lowest platform level we support for the entire apk. the targetSdkVersion is 26, meaning we have tested up to 26 so the device platform will not apply any compatibility behaviors to make it run on 26 or below. But it will for 27+.

So the --api 16 we are using here is to assemble the NDK to build projects/rust. The --with-android-version field in the mozconfig is what firefox uses for its build. These should match (I know they are mismatched in the current branch due to testing)

Changes (android-1115)

Using latest patch: 0001-Bug-28051-Build-Orbot-as-a-Library.patch (v3 on trac issue)
Updated gradle-dependency-list
Removed fetch-gradle-dependencies (this is now in common)
Using gradle 4.1 rather than gradle 4.4 (we can do this due to downgrade of plugin version in patch)
Verified jsocksAndroid project building

Trac:
Status: new to needs_review

Trac:
Keywords: TorBrowserTeam201811 deleted, TorBrowserTeam201811R added

Changes (android-1116)

Moved orbot changes from #27443 (moved) to #27977 (moved)

I think we can start with gradle_dependencies_version: 1 for Orbot (arguably we could have started with 1 for Firefox as well as bumping it was only necessary before the code got merged but that's okay).

So, I've been building with commit e7f17024482c5dd2cca16f1d953bcf85afe51a3f and fb9bd14cd96709b608c19640e26b271ae03b7c4c and got rid of my Orbot on my phone. I still get the question about that I need Tor to get installed. Looking at the .apk it seems Orbot related stuff is missing... I need to dig deeper but where should the Orbot pieces in the .apk be, ideally?

Replying to gk:

So, I've been building with commit e7f17024482c5dd2cca16f1d953bcf85afe51a3f and fb9bd14cd96709b608c19640e26b271ae03b7c4c and got rid of my Orbot on my phone. I still get the question about that I need Tor to get installed. Looking at the .apk it seems Orbot related stuff is missing... I need to dig deeper but where should the Orbot pieces in the .apk be, ideally?

According to https://trac.torproject.org/projects/tor/ticket/27443#comment:79 the tor-browser needs to be pointing to a branch to test orbot integration.

I need to do testing as well.

I see we are using the gradle option --offline. Should we mention this option in how-to-create-gradle-dependencies-list.txt?

I'm also wondering how easy it would be to enable this option in the firefox build to make sure we don't download gradle dependencies during the build (although #25623 (moved) would also help for that).

Replying to boklm:

I see we are using the gradle option --offline. Should we mention this option in how-to-create-gradle-dependencies-list.txt?

I'm also wondering how easy it would be to enable this option in the firefox build to make sure we don't download gradle dependencies during the build (although #25623 (moved) would also help for that).

Yes there are a couple of differences between generating dependencies between the projects. For orbot,

cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo
cp -r $gradle_repo/dl/android/maven2/* $gradle_repo

These lines will break build if the dependency list is empty on regeneration. So I need to update for that as well.

I'm not sure how to modify the gradle options with --offline in firefox since I haven't dug that deeply into that part.

Replying to sisbell:

Replying to gk:

So, I've been building with commit e7f17024482c5dd2cca16f1d953bcf85afe51a3f and fb9bd14cd96709b608c19640e26b271ae03b7c4c and got rid of my Orbot on my phone. I still get the question about that I need Tor to get installed. Looking at the .apk it seems Orbot related stuff is missing... I need to dig deeper but where should the Orbot pieces in the .apk be, ideally?

According to https://trac.torproject.org/projects/tor/ticket/27443#comment:79 the tor-browser needs to be pointing to a branch to test orbot integration.

Ha, indeed. That's been the issue, sorry for the noise.

The build fails for me in the mach android assemble-app stage now. See attached log. While skimming over the log there are at least two issues:

There are still .pom and .jar files downloaded
There seems to be stuff that is missing for the build, e.g.:

26:47.22 > Could not find com.android.support:support-annotations:25.0.1.

Looking at the patches I have applied on that branch (in case that matters) there are the ones for #27443 (moved), #28144 (moved), #28472 (moved), #27977 (moved), and #28468 (moved). Additionally, I patch tor-browser with sysrqb's patches at build time.

Trac:
build.log.bz2

Replying to gk:

The build fails for me in the mach android assemble-app stage now. See attached log. While skimming over the log there are at least two issues:

There are still .pom and .jar files downloaded

There seems to be stuff that is missing for the build, e.g.: {{{ 26:47.22 > Could not find com.android.support:support-annotations:25.0.1. }}}

Looking at the patches I have applied on that branch (in case that matters) there are the ones for #27443 (moved), #28144 (moved), #28472 (moved), #27977 (moved), and #28468 (moved). Additionally, I patch tor-browser with sysrqb's patches at build time.

There must be some additional libraries in the branch that the patch does not account for. I'll need to run off of the branch + patch and regenerate the list of dependencies.

I enabled downloads for artifacts but still encounter an exception. I'll need to dig into this some more before committing changes.

18:20.19 Could not resolve all files for configuration ':app:officialWithoutGeckoBinariesNoMinApiPhotonDebugCompileClasspath'.
18:20.19 > Failed to transform file 'Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar' to match attributes {artifactType=android-exploded-aar} using transform ExtractAarTransform
18:20.19    > java.io.FileNotFoundException: /var/tmp/build/firefox-3a56f176c89b/mobile/android/app/Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar (No such file or directory)

Replying to sisbell:

I enabled downloads for artifacts but still encounter an exception. I'll need to dig into this some more before committing changes.

{{{ 18:20.19 Could not resolve all files for configuration ':app:officialWithoutGeckoBinariesNoMinApiPhotonDebugCompileClasspath'. 18:20.19 > Failed to transform file 'Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar' to match attributes {artifactType=android-exploded-aar} using transform ExtractAarTransform 18:20.19 > java.io.FileNotFoundException: /var/tmp/build/firefox-3a56f176c89b/mobile/android/app/Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar (No such file or directory) }}}

Orbot is building with Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar which is a more recent version than the one the test branch uses.

I'm having a problem getting this to build off of https://git.torproject.org/user/sysrqb/tor-browser.git with branch 28051_1.

With a first run, I get missing dependencies in firefox project. I create a new dependency list and I get further but then encounter the FileNotFoundException: mobile/android/app/Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar

Next I try to build Orbot project using the branch for 16.0.3-BETA-2-tor-0.3.4.8, hoping to match Orbot and Firefox with the same version. The 0001-Bug-28051-Build-Orbot-as-a-Library.patch fails to apply when building Orbot. If I remove the command that applies the patch, the build fails with a missing dependency for Orbot project.

I'm not sure how I should proceed from here. I feel like maybe I'm not pointing the right branches?

Right. The tor-browser branch expects Orbot-16.0.3-BETA-2-tor-0.3.4.8-fullperm-release.aar but tor-browser-build is using version 16.0.5-RC-1. I'll update my tor-browser branch so it matches.

Okay, please give these a try. (See ticket:28051#comment:15)

There's a new Orbot patch - https://trac.torproject.org/projects/tor/attachment/ticket/28051/0001-Bug-28051-Build-Orbot-as-a-Library.4.patch and there's a new tor-browser branch: 28051_2

So I configured to the latest patch and branch (I had to update the torproject-android-binary to latest version in dependencies). I now see this exception

:app:compileFullpermReleaseJavaWithJavac/var/tmp/build/orbot-0b5a48d4e086/app/src/main/java/org/torproject/android/OrbotMainActivity.java:531: error: cannot find symbol
            TextView versionName = (TextView)view.findViewById(R.id.versionName);
                                                                   ^
  symbol:   variable versionName
  location: class id

Yeah, sorry about that. I started looking at a bug I found in the version number Orbot displays and I accidentally included that in this patch. Try this one - https://trac.torproject.org/projects/tor/attachment/ticket/28051/0001-Bug-28051-Build-Orbot-as-a-Library.5.patch

Replying to sysrqb:

Yeah, sorry about that. I started looking at a bug I found in the version number Orbot displays and I accidentally included that in this patch. Try this one - https://trac.torproject.org/projects/tor/attachment/ticket/28051/0001-Bug-28051-Build-Orbot-as-a-Library.5.patch

Yes, that does work thanks! I'll need to generate new dependency lists and get it checked in for further testing.

Changes (android-1120a)

Updated Orbot patch
Updated orbot gradle dependencies
Updated firefox gradle dependencies

To test firefox, config needs changes

git_hash: 28051_2
git_url: https://git.torproject.org/user/sysrqb/tor-browser.git

TODO

Testing apk
Updated common how-to document for orbot

I tested the APK. It starts up and first displays Orbot. I can configure Orbot. When I hit exit from Orbot menu, firefox displays.

So the basics look good.

I built with the tor-browser-60.3.0esr-8.5-1 branch and the latest patch for #27977 (moved) + put the patchset from sysrqb's 28051_3 on top of it. I'll get a compile error now:

26:56.09 :app:compileOfficialWithoutGeckoBinariesNoMinApiPhotonDebugJavaWithJavac/var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:38: error: cannot find symbol
26:56.09 import org.torproject.android.service.util.NotificationBuilderCompat;
26:56.09                                           ^
26:56.09   symbol:   class NotificationBuilderCompat
26:56.09   location: package org.torproject.android.service.util
26:56.09 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:31: error: cannot find symbol
26:56.09 import org.torproject.android.service.util.NotificationBuilderCompat;
26:56.09                                           ^
26:56.09   symbol:   class NotificationBuilderCompat
26:56.09   location: package org.torproject.android.service.util
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:237: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
26:57.48               ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationHelper
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:237: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
26:57.48                                                       ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationHelper
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:147: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
26:57.48               ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationClient
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:147: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
26:57.48                                                       ^
26:57.49   symbol:   class NotificationBuilderCompat
26:57.49   location: class NotificationClient
26:58.33 Note: Some input files use or override a deprecated API.
26:58.33 Note: Recompile with -Xlint:deprecation for details.
26:58.33 6 errors
26:58.33  FAILED

Replying to gk:

I built with the tor-browser-60.3.0esr-8.5-1 branch and the latest patch for #27977 (moved) + put the patchset from sysrqb's 28051_3 on top of it. I'll get a compile error now:

26:56.09 :app:compileOfficialWithoutGeckoBinariesNoMinApiPhotonDebugJavaWithJavac/var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:38: error: cannot find symbol
26:56.09 import org.torproject.android.service.util.[NotificationBuilderCompat](NotificationBuilderCompat);
26:56.09                                           ^
26:56.09   symbol:   class NotificationBuilderCompat
26:56.09   location: package org.torproject.android.service.util
26:56.09 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:31: error: cannot find symbol
26:56.09 import org.torproject.android.service.util.[NotificationBuilderCompat](NotificationBuilderCompat);
26:56.09                                           ^
26:56.09   symbol:   class NotificationBuilderCompat
26:56.09   location: package org.torproject.android.service.util
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:237: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
26:57.48               ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationHelper
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java:237: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
26:57.48                                                       ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationHelper
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:147: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
26:57.48               ^
26:57.48   symbol:   class NotificationBuilderCompat
26:57.48   location: class NotificationClient
26:57.48 /var/tmp/build/firefox-970fcfe56478/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java:147: error: cannot find symbol
26:57.48         final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
26:57.48                                                       ^
26:57.49   symbol:   class NotificationBuilderCompat
26:57.49   location: class NotificationClient
26:58.33 Note: Some input files use or override a deprecated API.
26:58.33 Note: Recompile with -[Xlint:deprecation Xlint:deprecation] for details.
26:58.33 6 errors
26:58.33  FAILED
}}}

Looks like your setup is out of sync (or perhaps something wasn't checked in). This was recently added to 28051_3. It adds the custom notification that your build log is saying its missing.

{{{ commit 4fd4234b10ee9af9dbd7e0d217135247f976015d Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Thu Nov 22 05:06:08 2018 +0000

Bug 28051 - Use the custom notification compat impl

Replying to sisbell:

Looks like your setup is out of sync (or perhaps something wasn't checked in). This was recently added to 28051_3. It adds the custom notification that your build log is saying its missing.
commit 4fd4234b10ee9af9dbd7e0d217135247f976015d
Author: Matthew Finkel <Matthew.Finkel@gmail.com>
Date:   Thu Nov 22 05:06:08 2018 +0000

    Bug 28051 - Use the custom notification compat impl

}}}

Yeah, that's been my first intuition as well but the patch does get applied properly. From the build log that is failing: {{{ patching file mobile/android/base/java/org/mozilla/gecko/GeckoApp.java Hunk #2 (closed) succeeded at 598 (offset 4 lines). Hunk #3 (closed) succeeded at 1217 (offset 11 lines). patching file mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java patching file mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java patching file mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java patching file mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java

And checking the patch again which I apply, it has all the notifications changes as well from commit 4fd4234b10ee9af9dbd7e0d217135247f976015d. So, this is weird...

Replying to gk:

Replying to sisbell:
Looks like your setup is out of sync (or perhaps something wasn't checked in). This was recently added to 28051_3. It adds the custom notification that your build log is saying its missing.

{{{ commit 4fd4234b10ee9af9dbd7e0d217135247f976015d Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Thu Nov 22 05:06:08 2018 +0000
Bug 28051 - Use the custom notification compat impl
}}}
Yeah, that's been my first intuition as well but the patch does get applied properly. From the build log that is failing: {{{ patching file mobile/android/base/java/org/mozilla/gecko/GeckoApp.java Hunk #2 (closed) succeeded at 598 (offset 4 lines). Hunk #3 (closed) succeeded at 1217 (offset 11 lines). patching file mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java patching file mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java patching file mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java patching file mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java }}} And checking the patch again which I apply, it has all the notifications changes as well from commit 4fd4234b10ee9af9dbd7e0d217135247f976015d. So, this is weird...

I'm not seeing NotificationBuilderCompat.java when I search the project. I don't see the class added in commit abc79c5c2a2ec8cdbfe3f167e1ae50a4b6a6cbdb So we need to locate this missing file. My guess is it should have been checked in with the commit but wasn't.

FWIW I am now getting different errors when building. I just restarted a build without changing any patches:

26:37.83 FAILURE: Build completed with 4 failures.
26:37.85 
26:37.85 1: Task failed with an exception.
26:37.85 -----------
26:37.85 * What went wrong:
26:37.85 Could not resolve all files for configuration ':app:officialWithoutGeckoBinariesNoMinApiPhotonDebugAndroidTestRuntimeClasspath'.
26:37.85 > Could not resolve org.torproject:tor-android-binary:0.3.4.9.
26:37.85   Required by:
26:37.85       project :app

Replying to gk:

FWIW I am now getting different errors when building. I just restarted a build without changing any patches: {{{ 26:37.83 FAILURE: Build completed with 4 failures. 26:37.85 26:37.85 1: Task failed with an exception. 26:37.85 ----------- 26:37.85 * What went wrong: 26:37.85 Could not resolve all files for configuration ':app:officialWithoutGeckoBinariesNoMinApiPhotonDebugAndroidTestRuntimeClasspath'. 26:37.85 > Could not resolve org.torproject:tor-android-binary:0.3.4.9. 26:37.85 Required by: 26:37.85 project :app }}}

I'll need to look into this one. I do see tor-android-binary-0.3.4.9.aar in the gradles-dependencies-list txt file so I'm not sure off-hand what could be causing this failure.

Replying to sisbell:

I'm not seeing NotificationBuilderCompat.java when I search the project. I don't see the class added in commit abc79c5c2a2ec8cdbfe3f167e1ae50a4b6a6cbdb So we need to locate this missing file. My guess is it should have been checked in with the commit but wasn't.

Looking closer this guess seems reasonable. Let's wait on sysrqb then (not sure what the idea here is/was).

Replying to sisbell:

Replying to gk:

FWIW I am now getting different errors when building. I just restarted a build without changing any patches: {{{ 26:37.83 FAILURE: Build completed with 4 failures. 26:37.85 26:37.85 1: Task failed with an exception. 26:37.85 ----------- 26:37.85 * What went wrong: 26:37.85 Could not resolve all files for configuration ':app:officialWithoutGeckoBinariesNoMinApiPhotonDebugAndroidTestRuntimeClasspath'. 26:37.85 > Could not resolve org.torproject:tor-android-binary:0.3.4.9. 26:37.85 Required by: 26:37.85 project :app }}}

I'll need to look into this one. I do see tor-android-binary-0.3.4.9.aar in the gradles-dependencies-list txt file so I'm not sure off-hand what could be causing this failure.

FWIW: I did not get this again, so not sure what's up with that, but just the NotificationBuilderCompat() related issues, with and without gradle downloading deps.

Setting as needs_revision for the doc update mentioned in comment:24. sisbell: it might be worth do double-check the gradle dependency list as well. I followed the how-to and commented export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" and then built. My build was failing (see the previous comment) but the download happened before it seems. The resulting extraction leads to 214 lines of dependencies while your checked-in file on android-1120a has over 300 lines.

Trac:
Status: needs_review to needs_revision
Keywords: TorBrowserTeam201811R deleted, TorBrowserTeam201811 added

Replying to gk:

FWIW: I did not get this again, so not sure what's up with that, but just the NotificationBuilderCompat() related issues, with and without gradle downloading deps.

Ugh. Yes, that's my fault. I added that commit on the wrong branch. I'm updating #28051 (moved) with details about that commit.

Replying to gk:

Setting as needs_revision for the doc update mentioned in comment:24. sisbell: it might be worth do double-check the gradle dependency list as well. I followed the how-to and commented export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" and then built. My build was failing (see the previous comment) but the download happened before it seems. The resulting extraction leads to 214 lines of dependencies while your checked-in file on android-1120a has over 300 lines.

I'll double check to make sure. I usually dedup the file to make sure nothing gets added twice. I think before any merge, I should do a fresh dependency list, as this can change based on the branch/changes.