Skip to content

Commit

Permalink
fix(android): handle AD_SERVICES_CONFIG manifest merge collision in S…
Browse files Browse the repository at this point in the history
…DK v18 (#600)


---------

Co-authored-by: Mike Hardy <[email protected]>
  • Loading branch information
TheRogue76 and mikehardy authored Jan 26, 2025
1 parent 961a969 commit d94ba92
Showing 1 changed file with 25 additions and 2 deletions.
27 changes: 25 additions & 2 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,29 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->

<manifest
package="com.facebook.reactnative.androidsdk">
<!--
This may generate a warning during your build:
> property#android.adservices.AD_SERVICES_CONFIG@android:resource
> was tagged at AndroidManifest.xml:23 to replace other declarations
> but no other declaration present
You may safely ignore this warning.
We must include this in case you also use something else
that may also include this file, because if two modules include it, they
will collide and cause a build error if we don't set this one to take
priority via replacement.
https://github.com/thebergamo/react-native-fbsdk-next/issues/597
-->
<manifest package="com.facebook.reactnative.androidsdk"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<property
android:name="android.adservices.AD_SERVICES_CONFIG"
android:resource="@xml/ad_services_config"
tools:replace="android:resource" />
</application>
</manifest>

0 comments on commit d94ba92

Please sign in to comment.