Note that baseline.prof is the same, but baseline.profm is different. Attaching what I got locally from two runs.

Passing to Rahul

This seems to be an ordering issue that should be easy to fix:

$ cmp 1.profm 2.profm
1.profm 2.profm differ: byte 24, line 1
$ diff -Naur <( repro-apk dump-baseline 1.profm ) <( repro-apk dump-baseline 2.profm )
 profm version=002
 num_dex_files=2
 profile_idx=0
-  profile_key='classes2.dex'
-  num_type_ids=2418
-  num_class_ids=0
-profile_idx=1
   profile_key='classes.dex'
   num_type_ids=8122
   num_class_ids=738
+profile_idx=1
+  profile_key='classes2.dex'
+  num_type_ids=2418
+  num_class_ids=0
$ repro-apk sort-baseline 1.profm 1s.profm
$ cmp 1s.profm 2.profm && echo OK
OK

https://github.com/obfusk/reproducible-apk-tools#dump-baselinepy

https://github.com/obfusk/reproducible-apk-tools#sort-baselinepy

This seems trivial to fix when generating the file.

As a workaround, adding this snippet to build.gradle makes it stable:

import com.android.tools.profgen.ArtProfileKt
import com.android.tools.profgen.ArtProfileSerializer
import com.android.tools.profgen.DexFile

project.afterEvaluate {
    tasks.compileReleaseArtProfile.doLast {
        outputs.files.each { file ->
            if (file.toString().endsWith(".profm")) {
                println("Sorting ${file} ...")
                def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
                def profile = ArtProfileKt.ArtProfile(file)
                def keys = new ArrayList(profile.profileData.keySet())
                def sortedData = new LinkedHashMap()
                Collections.sort keys, new DexFile.Companion()
                keys.each { key -> sortedData[key] = profile.profileData[key] }
                new FileOutputStream(file).with {
                    write(version.magicBytes$profgen)
                    write(version.versionBytes$profgen)
                    version.write$profgen(it, sortedData, "")
                }
            }
        }
    }
}

This might have been fixed with this change, which is included in AGP 7.3.X and higher

Unfortunately, I've confirmed the issue with com.android.tools.build:gradle:7.4.0 (and 7.3.0).

The problem is that in ArtProfile.kt:

val profileData = HashMap<DexFile, DexFileData>()

Which means the order of iterating over profileData is non-deterministic.

In ArtProfileSerializer.kt, METADATA_FOR_N, V0_1_0_P, and V0_0_9_OMR1 sort before iterating:

profileData.entries.sortedBy { it.key.name }

And V0_0_5_O and V0_0_1_N sort as well:

for ((dex, data) in profileData.toSortedMap(DexFile)) {

But METADATA_0_0_2 doesn't sort:

profileData.onEachIndexed { index, entry ->

And neither does V0_1_5_S:

profileData.forEach { entry ->

profileData.onEachIndexed { index, entry ->

profileData.onEachIndexed { index, entry ->

Which is why their output is non-deterministic.

https://googleplex-android-review.git.corp.google.com/c/platform/tools/base/+/21061172 addresses this.

Thanks! I was hoping to see the fix, but that URL seems to be only accessible to Google employees.

Here's a public link.

Found it: https://android.googlesource.com/platform/tools/base/+/2f2c6b30b55e18e2672edf5ee8e8e583be759d3e

What AGP version can we expect the fix to be in?

AGP 8.1.0-alpha03