Skip to content

Add a tools:remove rule to the discovery service definition. #2563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2021

Conversation

vkryachko
Copy link
Member

The removal is needed to satisfy the manifest merger when it merges
manifests across dynamic feature modules into the base app.

Since each Firebase SDK has a discovery service definition in its
manifest, placing them into a dynamic feature adds
android:splitName="featureName" to the discovery service. Subsequent
merge into the main app manifest causes a conflict since the splitName
is different in each feature.

Note that this change is also moving the dynamic module support
registrar definition to firebase-dynamic-module-support since having
an android:remove in firebase-common produces a warning when the app
does not use dynamic feature modules. To avoid this warning, the
manifest entry will now live in the dynamic module support sdk, since
it's only expected to be used if the host app uses dynamic features.

http://b/184263558

The removal is needed to satisfy the manifest merger when it merges
manifests across dynamic feature modules into the base app.

Since each Firebase SDK has a discovery service definition in its
manifest, placing them into a dynamic feature adds
`android:splitName="featureName"` to the discovery service. Subsequent
merge into the main app manifest causes a conflict since the splitName
is different in each feature.

Note that this change is also moving the dynamic module support
registrar definition to `firebase-dynamic-module-support` since having
an `android:remove` in `firebase-common` produces a warning when the app
does not use dynamic feature modules. To avoid this warning, the
manifest entry will now live in the dynamic module support sdk, since
it's only expected to be used if the host app uses dynamic features.

http://b/184263558
@google-cla google-cla bot added the cla: yes Override cla label Apr 1, 2021
@vkryachko vkryachko requested review from rlazo and davidmotson April 1, 2021 17:37
@google-oss-bot
Copy link
Contributor

google-oss-bot commented Apr 1, 2021

Binary Size Report

Affected SDKs

  • firebase-common

    Type Base (0a5b6ba) Head (3351a919) Diff
    aar 50.1 kB 50.0 kB -167 B (-0.3%)
    apk (aggressive) 77.9 kB 77.8 kB -80 B (-0.1%)
    apk (release) 635 kB 635 kB -80 B (-0.0%)
  • firebase-dynamic-module-support

    Type Base (0a5b6ba) Head (3351a919) Diff
    aar 5.52 kB 5.74 kB +216 B (+3.9%)
    apk (release) 745 kB 745 kB -4 B (-0.0%)

Test Logs

Notes

Head commit (3351a919) is created by Prow via merging commits: 0a5b6ba a1a89d9.

@google-oss-bot
Copy link
Contributor

google-oss-bot commented Apr 1, 2021

Coverage Report

Affected SDKs

No changes between base commit (0a5b6ba) and head commit (3351a919).

Test Logs

Notes

HTML coverage reports can be produced locally with ./gradlew <product>:checkCoverage.
Report files are located at <product-build-dir>/reports/jacoco/.

Head commit (3351a919) is created by Prow via merging commits: 0a5b6ba a1a89d9.

@vkryachko
Copy link
Member Author

/retest

@google-oss-bot
Copy link
Contributor

@vkryachko: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
device-check-changed a1a89d9 link /test device-check-changed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@vkryachko vkryachko merged commit ac3276c into master Apr 1, 2021
@vkryachko vkryachko deleted the vk.manifest_merge branch April 1, 2021 23:02
@firebase firebase locked and limited conversation to collaborators May 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes Override cla size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants