github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-24 14:28:58 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #3085] [MERGED] [PM-6852 ] Fix F-Droid build constant #41106

New Issue
Closed
opened 2026-04-23 19:54:32 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-23 19:54:32 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3085
Author: @fedemkr
Created: 3/15/2024
Status: ✅ Merged
Merged: 3/15/2024
Merged by: @fedemkr

Base: main ← Head: fix-fdroid-trackers-removal

📝 Commits (4)

  • 68a1732 Fix FDROID trackers removal by changing publish to build to see if doing this it adds the corresponding CustomConstants
  • 608b23d Changed parameters in new line delimiter to the one used in bash to see if that fixes passing the corresponding parameters to the build
  • e59a22e Revert "Changed parameters in new line delimiter to the one used in bash to see if that fixes passing the corresponding parameters to the build"
  • 950b2ea Enable FDROID constant by replacing the content of Directory.Build.props in the clean stage of F-Droid

📊 Changes

2 files changed (+12 additions, -7 deletions)

View changed files

📝 .github/workflows/build.yml (+9 -7)
📝 Directory.Build.props (+3 -0)

📄 Description

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

Fix CI/CD to for F-Droid build to pass the constant as it's supposed to so AppCenter and Firebase are removed from the final apk.

There seems to be an issue when building for Release configuration where the :/p CustomConstants=FDROID is not added to the DefineConstants or replaced at some point, causing the corresponding packages not to be removed from the build. So the approach was changed by not passing the parameter in the command and enabling the constant in the Directory.Build.props

Code changes

  • Directory.Build.props: Added a comment for the FDROID custom constant.
  • build.yml: Enabled FDROID custom constant on the Directory.Build.props by replacing the commented line with the uncommented version of it.

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/3085 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 3/15/2024 **Status:** ✅ Merged **Merged:** 3/15/2024 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `main` ← **Head:** `fix-fdroid-trackers-removal` --- ### 📝 Commits (4) - [`68a1732`](https://github.com/bitwarden/android/commit/68a173236f18c9d597a28005daec45c9a06ba2dd) Fix FDROID trackers removal by changing publish to build to see if doing this it adds the corresponding CustomConstants - [`608b23d`](https://github.com/bitwarden/android/commit/608b23d115c636a58c184f519de501ac1d22e2ae) Changed parameters in new line delimiter to the one used in bash to see if that fixes passing the corresponding parameters to the build - [`e59a22e`](https://github.com/bitwarden/android/commit/e59a22e8769bdd236325d8bf5d313101b466d08c) Revert "Changed parameters in new line delimiter to the one used in bash to see if that fixes passing the corresponding parameters to the build" - [`950b2ea`](https://github.com/bitwarden/android/commit/950b2ea25d97a84966199493e5ca677047754a89) Enable FDROID constant by replacing the content of Directory.Build.props in the clean stage of F-Droid ### 📊 Changes **2 files changed** (+12 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/build.yml` (+9 -7) 📝 `Directory.Build.props` (+3 -0) </details> ### 📄 Description ## Type of change - [X] Bug fix - [ ] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> Fix CI/CD to for F-Droid build to pass the constant as it's supposed to so AppCenter and Firebase are removed from the final apk. There seems to be an issue when building for `Release` configuration where the `:/p CustomConstants=FDROID` is not added to the `DefineConstants` or replaced at some point, causing the corresponding packages not to be removed from the build. So the approach was changed by not passing the parameter in the command and enabling the constant in the `Directory.Build.props` ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **Directory.Build.props:** Added a comment for the FDROID custom constant. * **build.yml:** Enabled FDROID custom constant on the `Directory.Build.props` by replacing the commented line with the uncommented version of it. ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If this change has particular **deployment requirements** - notify the DevOps team --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-23 19:54:32 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#41106