Skip to content

Commit ab6d2d5

Browse files
moljacmoljac
authored
Merge pull request #1086 from dotnet/dev/moljac/mu-20250131-fix-973-1083-admob
`com.google.android.gms:play-services-ads-lite` (AdMob) improvements
2 parents 8ec3c61 + e89cb82 commit ab6d2d5

File tree

3 files changed

+2
-225
lines changed

3 files changed

+2
-225
lines changed

Diff for: ‎published-namespaces.txt

+1
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,7 @@ Google.Ads.InteractiveMedia.V3.Impl.Data
979979
Google.Ads.Mediation
980980
Google.Ads.Mediation.Admob
981981
Google.Ads.Nonagon.Util.Logging.Csi
982+
Google.Android.Gms.Ads.Internal.Offline.Buffering
982983
Google.Android.Gms.Ads.Nonagon.SignalGeneration
983984
Google.Android.Libraries.AppActions.Service
984985
Google.Android.Libraries.Places.Api.Auth

Diff for: ‎source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs

-58
This file was deleted.

Diff for: ‎source/com.google.android.gms/play-services-ads-lite/Transforms/Metadata.xml

+1-167
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,6 @@
3030
<attr path="/api/package[@name='com.google.android.gms.ads.purchase']/interface[@name='PlayStorePurchaseListener']/method[@name='onInAppPurchaseFinished']/parameter[1]" name="managedName">inAppPurchaseResult</attr>
3131

3232

33-
<!-- Remove some internal namespaces -->
34-
<remove-node path="/api/package[@name='com.google.android.gms.ads.internal.offline.buffering']" />
35-
36-
<!--
37-
<remove-node path="/api/package[contains(@name, 'android.gms.internal')]" />
38-
<remove-node path="/api/package[contains(@name, 'com.google.android.gms.ads.internal')]" />
39-
-->
40-
<!-- Remove *zz* obfuscated items -->
41-
<!--
42-
<remove-node path="/api/package/class[contains(@name, 'zz')]" />
43-
<remove-node path="/api/package/interface[contains(@name, 'zz')]" />
44-
<remove-node path="/api/*/*[@name != 'interface']/method[contains(@name, 'zz')]" />
45-
-->
46-
<!--
47-
<remove-node path="/api/*/*/field[contains(@name, 'zz')]" />
48-
-->
49-
50-
5133
<!-- Some classes are private that need to be public to subclass -->
5234
<attr path="/api/package[@name='com.google.android.gms.ads']/class[@name='BaseAdView']" name="visibility">public</attr>
5335

@@ -124,13 +106,6 @@
124106
<!-- <attr path="/api/package[@name='com.google.ads.doubleclick']/interface[@name='OnCustomRenderedAdLoadedListener']/method[@name='onCustomRenderedAdLoaded']/parameter[1]" name="managedName">ad</attr>-->
125107

126108

127-
<remove-node path="/api/package[@name='com.google.android.gms.ads']/class[@name='AdSize']/field[@name='zzako']" />
128-
129-
<!--
130-
<remove-node path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationBannerListener']" />
131-
<remove-node path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']" />
132-
-->
133-
134109
<attr path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']/method[@name='zza']" name="obfuscated">false</attr>
135110
<attr path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='zza']" name="obfuscated">false</attr>
136111

@@ -229,148 +204,6 @@
229204
</attr>
230205

231206

232-
<!--
233-
causing ACW errors:
234-
./samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/obj/Debug/android/src/crc6449ab38c9a8eed94c/MainActivity.java(36,36):
235-
Error JAVAC0000: error: cannot inherit from final AdActivity
236-
extends com.google.android.gms.ads.AdActivity
237-
(JAVAC0000) (AdsLiteSample) javac
238-
<attr
239-
path="/api/package[@name='com.google.android.gms.ads']/class[@name='AdActivity']"
240-
name="final"
241-
>
242-
false
243-
</attr>
244-
245-
<attr
246-
path="/api/package[@name='com.google.android.gms.ads.appopen']"
247-
name="managedName"
248-
>
249-
Android.Gms.Ads.AppOpen
250-
</attr>
251-
<attr
252-
path="/api/package[@name='com.google.android.gms.ads.instream']"
253-
name="managedName"
254-
>
255-
Android.Gms.Ads.InStream
256-
</attr>
257-
<attr
258-
path="/api/package[@name='com.google.android.gms.ads.query']"
259-
name="managedName"
260-
>
261-
Android.Gms.Ads.Query
262-
</attr>
263-
-->
264-
265-
<!--
266-
https://github.com/xamarin/GooglePlayServicesComponents/issues/334
267-
268-
error: ShouldDelayBannerRenderingListenerImplementor is not abstract and does not override abstract method zzb(Runnable) in ShouldDelayBannerRenderingListener
269-
-->
270-
<!--
271-
Attempt 01:
272-
273-
<remove-node
274-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']"
275-
/>
276-
<remove-node
277-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
278-
/>
279-
-->
280-
<!--
281-
Additions.cs for tweaking
282-
-->
283-
<remove-node
284-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']"
285-
/>
286-
287-
<!--
288-
Attempt 02:
289-
<attr
290-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']"
291-
name="abstract"
292-
>
293-
false
294-
</attr>
295-
<attr
296-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
297-
name="obfuscated"
298-
>
299-
false
300-
</attr>
301-
<attr
302-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
303-
name="abstract"
304-
>
305-
false
306-
</attr>
307-
-->
308-
309-
<!--
310-
<attr
311-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
312-
name="obfuscated"
313-
>
314-
false
315-
</attr>
316-
<attr
317-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
318-
name="final"
319-
>
320-
true
321-
</attr>
322-
-->
323-
<!--
324-
<attr
325-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']"
326-
name="abstract"
327-
>true</attr>
328-
<attr
329-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
330-
name="abstract"
331-
>true</attr>
332-
-->
333-
334-
<!--
335-
TODO: issue in java.interop why was this necessary?
336-
337-
<add-node
338-
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']"
339-
>
340-
<method
341-
visibility="public" static="false" abstract="false" return="boolean" name="zzb"
342-
jni-signature="(Ljava/lang/Runnable;)Z" jni-return="Z"
343-
bridge="false" native="false" deprecated="not deprecated" synchronized="false" synthetic="false"
344-
obfuscated="false" final="true"
345-
>
346-
<parameter type="java.lang.Runnable" name="runnable" >
347-
</parameter>
348-
</method>
349-
</add-node>
350-
-->
351-
352-
353-
354-
355-
356-
357-
<remove-node
358-
path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']"
359-
/>
360-
<!--
361-
<attr
362-
path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']/method[@name='onAdLoaded' and count(parameter)=2 and parameter[1][@type='com.google.android.gms.ads.mediation.MediationNativeAdapter'] and parameter[2][@type='com.google.android.gms.ads.mediation.NativeAdMapper']]"
363-
name="managedName"
364-
>
365-
OnNativeAdLoaded
366-
</attr>
367-
<remove-node
368-
path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']/method[@name='zza' and count(parameter)=2 and parameter[1][@type='com.google.android.gms.ads.mediation.MediationNativeAdapter'] and parameter[2][@type='com.google.android.gms.ads.formats.NativeCustomTemplateAd']]"
369-
/>
370-
<remove-node
371-
path="/api/package[@name='com.google.android.gms.ads.mediation']/interface[@name='MediationNativeListener']/method[@name='zza' and count(parameter)=3 and parameter[1][@type='com.google.android.gms.ads.mediation.MediationNativeAdapter'] and parameter[2][@type='com.google.android.gms.ads.formats.NativeCustomTemplateAd'] and parameter[3][@type='java.lang.String']]"
372-
/>
373-
-->
374207
<attr
375208
path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb']"
376209
name="abstract"
@@ -606,4 +439,5 @@
606439
Android.Gms.Ads.Preload
607440
</attr>
608441

442+
609443
</metadata>

0 commit comments

Comments
 (0)