Skip to content

Commit c55c673

Browse files
mar-v-inmar-v-in
authored
Merge branch 'master' into iap_security_certification
2 parents 6007d87 + 97c9927 commit c55c673

292 files changed

Lines changed: 12797 additions & 638 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# Log available space
2727
df -h
2828
- name: "Checkout sources"
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v7
3030
with:
3131
fetch-depth: 0
3232
- name: "Setup Java"

‎.github/workflows/dependency-submission.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: "Checkout sources"
16-
uses: actions/checkout@v6
16+
uses: actions/checkout@v7
1717
with:
1818
fetch-depth: 0
1919
- name: "Setup Java"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def execResult(... args) {
7575
}
7676

7777
def ignoreGit = providers.environmentVariable('GRADLE_MICROG_VERSION_WITHOUT_GIT').getOrElse('0') == '1'
78-
def gmsVersion = "25.09.32"
78+
def gmsVersion = "25.24.32"
7979
def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
8080
def vendingVersion = "40.2.26"
8181
def vendingVersionCode = Integer.parseInt(vendingVersion.replaceAll('\\.', ''))

‎jitpack.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
jdk:
2+
- openjdk17
3+
install:
4+
#Default - ./gradlew clean -Pgroup=com.github.microg -Pversion=branch-commit-1 -xtest -xlint assemble publishToMavenLocal
5+
- sed -i '/withJavadocJar/d' gradle/publish-android.gradle
6+
- ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION -xtest -xlint publishToMavenLocal
7+
env:
8+
GRADLE_MICROG_VERSION_WITHOUT_GIT: 1

‎play-services-ads-api/build.gradle‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2026 microG Project Team
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
apply plugin: 'com.android.library'
7+
apply plugin: 'maven-publish'
8+
apply plugin: 'signing'
9+
10+
android {
11+
namespace "com.google.android.gms.ads"
12+
13+
compileSdkVersion androidCompileSdk
14+
buildToolsVersion "$androidBuildVersionTools"
15+
16+
buildFeatures {
17+
aidl = true
18+
}
19+
20+
defaultConfig {
21+
versionName version
22+
minSdkVersion androidMinSdk
23+
targetSdkVersion androidTargetSdk
24+
}
25+
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
}
31+
32+
apply from: '../gradle/publish-android.gradle'
33+
34+
description = 'microG implementation of play-services-ads-api'
35+
36+
dependencies {
37+
// Dependencies from play-services-ads-api:25.3.0
38+
api 'androidx.browser:browser:1.8.0'
39+
api 'androidx.core:core:1.10.1'
40+
api 'androidx.datastore:datastore:1.0.0'
41+
api 'androidx.work:work-runtime:2.7.0'
42+
//api 'com.google.android.ump:user-messaging-platform:4.0.0'
43+
api project(':play-services-basement')
44+
//api project(':play-services-measurement-sdk-api')
45+
annotationProcessor project(':safe-parcel-processor')
46+
}

play-services-ads-lite/core/build.gradle renamed to play-services-ads-api/core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'com.android.library'
77
apply plugin: 'kotlin-android'
88

99
dependencies {
10-
api project(':play-services-ads-lite')
10+
api project(':play-services-ads-api')
1111
implementation project(':play-services-base-core')
1212
}
1313

play-services-ads-lite/core/src/main/AndroidManifest.xml renamed to play-services-ads-api/core/src/main/AndroidManifest.xml

File renamed without changes.

play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt renamed to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.os.IBinder
88
import android.os.Parcel
99
import android.util.Log
1010
import androidx.annotation.Keep
11+
import com.google.android.gms.ads.internal.client.IAdLoaderBuilder
1112
import com.google.android.gms.ads.internal.client.IAdLoaderBuilderCreator
1213
import com.google.android.gms.ads.internal.mediation.client.IAdapterCreator
1314
import com.google.android.gms.dynamic.IObjectWrapper
@@ -16,10 +17,10 @@ import org.microg.gms.utils.warnOnTransactionIssues
1617
private const val TAG = "AdLoaderBuilder"
1718

1819
@Keep
19-
class AdLoaderBuilderCreatorImpl : IAdLoaderBuilderCreator.Stub() {
20-
override fun newAdLoaderBuilder(context: IObjectWrapper?, adUnitId: String, adapterCreator: IAdapterCreator?, clientVersion: Int): IBinder? {
20+
open class AdLoaderBuilderCreatorImpl : IAdLoaderBuilderCreator.Stub() {
21+
override fun newAdLoaderBuilder(context: IObjectWrapper?, adUnitId: String, adapterCreator: IAdapterCreator?, clientVersion: Int): IAdLoaderBuilder? {
2122
Log.d(TAG, "newAdLoaderBuilder: adUnitId=$adUnitId clientVersion=$clientVersion")
22-
return null
23+
return LegacyAdLoaderBuilder()
2324
}
2425

2526
override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }

‎play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdManagerCreatorImpl.kt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023 microG Project Team
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
package com.google.android.gms.ads
6+
7+
import android.content.Context
8+
import android.os.IBinder
9+
import android.os.Parcel
10+
import android.util.Log
11+
import androidx.annotation.Keep
12+
import com.google.android.gms.ads.internal.client.AdSizeParcel
13+
import com.google.android.gms.ads.internal.client.IAdManager
14+
import com.google.android.gms.ads.internal.client.IAdManagerCreator
15+
import com.google.android.gms.ads.internal.mediation.client.IAdapterCreator
16+
import com.google.android.gms.dynamic.IObjectWrapper
17+
import com.google.android.gms.dynamic.ObjectWrapper
18+
import org.microg.gms.utils.warnOnTransactionIssues
19+
20+
private const val TAG = "AdManagerCreator"
21+
22+
@Keep
23+
open class AdManagerCreatorImpl : IAdManagerCreator.Stub() {
24+
override fun newAdManager(context: IObjectWrapper?, adSize: AdSizeParcel?, adUnitId: String?, adapterCreator: IAdapterCreator?, clientVersion: Int): IAdManager {
25+
Log.d(TAG, "newAdManager: adUnitId=$adUnitId clientVersion=$clientVersion")
26+
return LegacyAdManager(ObjectWrapper.unwrap(context) as? Context)
27+
}
28+
29+
override fun newAdManagerByType(context: IObjectWrapper?, adSize: AdSizeParcel?, adUnitId: String?, adapterCreator: IAdapterCreator?, clientVersion: Int, type: Int): IAdManager {
30+
Log.d(TAG, "newAdManagerByType: adUnitId=$adUnitId clientVersion=$clientVersion type=$type")
31+
return LegacyAdManager(ObjectWrapper.unwrap(context) as? Context)
32+
}
33+
34+
override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean =
35+
warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }
36+
}

‎play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdLoaderBuilderCreatorImpl.kt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2026 microG Project Team
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
package com.google.android.gms.ads
6+
7+
import androidx.annotation.Keep
8+
9+
/**
10+
* Dynamite entry point for the native-ad (AdLoader) path.
11+
*
12+
* The AdMob SDK loads this class from the ads dynamite module by its fully-qualified name, so it must
13+
* exist under this exact FQCN and implement `IAdLoaderBuilderCreator`. Behaviour is identical to
14+
* [AdLoaderBuilderCreatorImpl], which is kept under its own name for SDKs that request the un-prefixed
15+
* class.
16+
*/
17+
@Keep
18+
class ChimeraAdLoaderBuilderCreatorImpl : AdLoaderBuilderCreatorImpl()

0 commit comments

Comments
 (0)