[pull] androidx-main from androidx:androidx-main

buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt

@@ -715,6 +715,7 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin<Project> {
             )
             project.configurePublicResourcesStub(variant)
             project.configureMultiplatformSourcesForAndroid(androidXExtension.samplesProjects)
+            project.configureVerifyELFRegionAlignment(variant)
             variant.aarMetadata.configureMinAgpVersion()
         }
 
@@ -875,17 +876,7 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin<Project> {
                     taskProvider.configure { task -> task.dependsOn("compileReleaseJavaWithJavac") }
                 }
             }
-            val verifyELFRegionAlignmentTaskProvider =
-                project.tasks.register(
-                    variant.name + "VerifyELFRegionAlignment",
-                    VerifyELFRegionAlignmentTask::class.java,
-                ) { task ->
-                    task.mergedNativeLibs.set(
-                        variant.artifacts.get(SingleArtifact.MERGED_NATIVE_LIBS)
-                    )
-                    task.cacheEvenIfNoOutputs()
-                }
-            project.addToBuildOnServer(verifyELFRegionAlignmentTaskProvider)
+            project.configureVerifyELFRegionAlignment(variant)
             variant.aarMetadata.configureMinAgpVersion()
         }
         project.buildOnServerDependsOnAssembleRelease()
@@ -1353,6 +1344,18 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin<Project> {
         }
     }
 
+    private fun Project.configureVerifyELFRegionAlignment(variant: LibraryVariant) {
+        val verifyELFRegionAlignmentTaskProvider =
+            project.tasks.register(
+                variant.name + "VerifyELFRegionAlignment",
+                VerifyELFRegionAlignmentTask::class.java,
+            ) { task ->
+                task.mergedNativeLibs.set(variant.artifacts.get(SingleArtifact.MERGED_NATIVE_LIBS))
+                task.cacheEvenIfNoOutputs()
+            }
+        project.addToBuildOnServer(verifyELFRegionAlignmentTaskProvider)
+    }
+
     /**
      * Tells whether this build contains the usual set of all projects (`./gradlew projects`)
      * Sometimes developers request to include fewer projects because this may run more quickly

buildSrc/private/src/main/kotlin/androidx/build/clang/KonanBuildService.kt

@@ -17,15 +17,19 @@
 package androidx.build.clang
 
 import androidx.build.KonanPrebuiltsSetup
+import androidx.build.OperatingSystem
 import androidx.build.ProjectLayoutType
 import androidx.build.clang.KonanBuildService.Companion.obtain
 import androidx.build.getKonanPrebuiltsFolder
+import androidx.build.getOperatingSystem
+import androidx.build.getSdkPath
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileCollection
+import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.services.BuildService
@@ -133,7 +137,18 @@ abstract class KonanBuildService @Inject constructor(private val execOperations:
         val linkerFlags =
             parameters.linkerArgs.get() +
                 if (parameters.konanTarget.get().asKonanTarget.family == Family.ANDROID) {
-                    listOf("-fuse-ld=lld", "-z", "max-page-size=16384")
+                    val customLld = this@KonanBuildService.parameters.androidLldPath.orNull?.asFile
+                    if (customLld != null) {
+                        listOf(
+                            "-fuse-ld=${customLld.absolutePath}",
+                            "-z",
+                            "max-page-size=16384",
+                            "-z",
+                            "common-page-size=16384",
+                        )
+                    } else {
+                        listOf("-fuse-ld=lld", "-z", "max-page-size=16384")
+                    }
                 } else {
                     emptyList()
                 }
@@ -235,6 +250,18 @@ abstract class KonanBuildService @Inject constructor(private val execOperations:
         /** Location if konan prebuilts. Can be null if this is a playground project */
         @get:Optional val prebuilts: DirectoryProperty
 
+        /**
+         * Use NDK lld linker in platform prebuilts for Android targets for 16KB alignment
+         *
+         * The default NDK linker used by Kotlin Native (LLD 8.0.7) is too old to support the `-z
+         * common-page-size` flag, which is required for proper 16KB page alignment without
+         * disabling RELRO (See b/476745201).
+         *
+         * The Android NDK support in Kotlin Native is not well maintained:
+         * https://kotlinlang.org/docs/native-target-support.html#tier-3
+         */
+        @get:Optional val androidLldPath: RegularFileProperty
+
         /**
          * The type of the project (Playground vs AOSP main). This value is used to ensure we
          * initialize Konan distribution properly.
@@ -263,6 +290,20 @@ abstract class KonanBuildService @Inject constructor(private val execOperations:
                 it.parameters.projectLayoutType.set(ProjectLayoutType.from(project))
                 if (!ProjectLayoutType.isPlayground(project)) {
                     it.parameters.prebuilts.set(project.getKonanPrebuiltsFolder())
+
+                    val os = getOperatingSystem()
+                    if (os == OperatingSystem.MAC || os == OperatingSystem.LINUX) {
+                        val platform = if (os == OperatingSystem.MAC) "darwin" else "linux"
+                        val lldPath =
+                            project
+                                .getSdkPath()
+                                .resolve(
+                                    "ndk-bundle/toolchains/llvm/prebuilt/${platform}-x86_64/bin/ld.lld"
+                                )
+                        if (lldPath.exists()) {
+                            it.parameters.androidLldPath.set(lldPath)
+                        }
+                    }
                 }
             }
         }

compose/foundation/foundation/api/current.txt

@@ -156,6 +156,7 @@ package androidx.compose.foundation {
     property public boolean isDelayPressesUsingGestureConsumptionEnabled;
     property public boolean isNestedDraggablesTouchConflictFixEnabled;
     property public boolean isNewContextMenuEnabled;
+    property public boolean isNonSuspendingPointerInputInCombinedClickableEnabled;
     property public boolean isPausableCompositionInPrefetchEnabled;
     property public boolean isSmartSelectionEnabled;
     property public boolean isTrackpadGestureHandlingEnabled;
@@ -167,6 +168,7 @@ package androidx.compose.foundation {
     field public static boolean isDelayPressesUsingGestureConsumptionEnabled;
     field public static boolean isNestedDraggablesTouchConflictFixEnabled;
     field public static boolean isNewContextMenuEnabled;
+    field public static boolean isNonSuspendingPointerInputInCombinedClickableEnabled;
     field public static boolean isPausableCompositionInPrefetchEnabled;
     field public static boolean isSmartSelectionEnabled;
     field public static boolean isTrackpadGestureHandlingEnabled;

compose/foundation/foundation/api/restricted_current.txt

@@ -156,6 +156,7 @@ package androidx.compose.foundation {
     property public boolean isDelayPressesUsingGestureConsumptionEnabled;
     property public boolean isNestedDraggablesTouchConflictFixEnabled;
     property public boolean isNewContextMenuEnabled;
+    property public boolean isNonSuspendingPointerInputInCombinedClickableEnabled;
     property public boolean isPausableCompositionInPrefetchEnabled;
     property public boolean isSmartSelectionEnabled;
     property public boolean isTrackpadGestureHandlingEnabled;
@@ -167,6 +168,7 @@ package androidx.compose.foundation {
     field public static boolean isDelayPressesUsingGestureConsumptionEnabled;
     field public static boolean isNestedDraggablesTouchConflictFixEnabled;
     field public static boolean isNewContextMenuEnabled;
+    field public static boolean isNonSuspendingPointerInputInCombinedClickableEnabled;
     field public static boolean isPausableCompositionInPrefetchEnabled;
     field public static boolean isSmartSelectionEnabled;
     field public static boolean isTrackpadGestureHandlingEnabled;

compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/ClickableBenchmark.kt

@@ -82,41 +82,52 @@ private class ClickablePerformClickTestCase : ComposeTestCase {
     var isPressed = false
         private set
 
-    private val indication = EmptyIndication()
+    private val indication = EmptyIndication { isPressed = it }
 
     @Composable
     override fun Content() {
         CompositionLocalProvider(LocalIndication provides indication) {
             Box(Modifier.fillMaxSize().clickable(onClick = { clickCount++ }))
         }
     }
+}
+
+internal class EmptyIndication(private val setIsPressed: (Boolean) -> Unit) :
+    IndicationNodeFactory {
 
-    private inner class EmptyIndication : IndicationNodeFactory {
+    override fun create(interactionSource: InteractionSource): DelegatableNode =
+        EmptyIndicationInstance(interactionSource, setIsPressed)
 
-        override fun create(interactionSource: InteractionSource): DelegatableNode =
-            EmptyIndicationInstance(interactionSource)
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is EmptyIndication) return false
 
-        override fun hashCode(): Int = -1
+        if (setIsPressed !== other.setIsPressed) return false
 
-        override fun equals(other: Any?) = other === this
+        return true
+    }
 
-        private inner class EmptyIndicationInstance(
-            private val interactionSource: InteractionSource
-        ) : Modifier.Node() {
+    override fun hashCode(): Int {
+        return setIsPressed.hashCode()
+    }
 
-            // it is a simplified version of what is happening in the real indications like ripple.
-            // as delivering interactions updates is a crucial part of what is happening during
-            // click, we should have it as part of this benchmark.
-            override fun onAttach() {
-                coroutineScope.launch {
-                    var pressCount = 0
-                    interactionSource.interactions.collect { interaction ->
-                        when (interaction) {
-                            is PressInteraction.Press -> pressCount++
-                            is PressInteraction.Release -> pressCount--
-                        }
-                        isPressed = pressCount > 0
+    private class EmptyIndicationInstance(
+        private val interactionSource: InteractionSource,
+        private val setIsPressed: (Boolean) -> Unit,
+    ) : Modifier.Node() {
+
+        // it is a simplified version of what is happening in the real indications like ripple.
+        // as delivering interactions updates is a crucial part of what is happening during
+        // click, we should have it as part of this benchmark.
+        override fun onAttach() {
+            coroutineScope.launch {
+                var pressCount = 0
+                interactionSource.interactions.collect { interaction ->
+                    when (interaction) {
+                        is PressInteraction.Press -> pressCount++
+                        is PressInteraction.Release -> pressCount--
                     }
+                    setIsPressed(pressCount > 0)
                 }
             }
         }