Baseline profiles plugin overrides variant enable property on test modules [343249144]

Fixed

Bug

Status Update

No update yet.

Description

r....@gmail.com

created issue #1

May 29, 2024 01:34PM

Component used: Baseline profiles plugin

Version used: 1.3.0-alpha05

Devices/Android versions reproduced on: N/A

We were trying to configure a variant filter using a convention plugin. For test modules (with plugin com.android.test), if baseline profiles plugin is applied after our convention plugin, it'll end up reenabling variants we just disabled before.

There's probably some ordering going on when registering/triggering androidComponents.beforeVariants callbacks?

I've narrowed it down to this line: https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt;l=231;drc=cebe814cae93028747ec8594b6edebb3ceee0daf

Is it possible for the plugin to consider the current enable state?

variantBuilder.enable =
    variantBuilder.enable &&
        (buildType in baselineProfileExtendedToOriginalTypeMap.keys ||
            buildType in benchmarkExtendedToOriginalTypeMap.keys)

Thanks!

Comments

ma...@google.com <ma...@google.com> May 30, 2024 05:03PM

Reassigned to ma...@google.com.

ma...@google.com <ma...@google.com> #2May 31, 2024 05:29PM

Accepted by ma...@google.com.

Any suggestions on where such an interface might live? I don't think it makes sense for the interface to be in the drawerlayout artifact if you're specifically going to use the interface to *not* use DrawerLayout.

ap...@google.com <ap...@google.com> #3May 31, 2024 07:22PM

androidx.customview would be a good candidate. This is used by all of the widget libraries.

ma...@google.com <ma...@google.com> May 31, 2024 07:22PM

Marked as fixed.

pr...@google.com <pr...@google.com> #4Jun 12, 2024 10:45PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 3ed3fb003fa6c1244f923202859a616225b5b2fa
Author: Ian Lake <ilake@google.com>
Date: Fri Feb 14 11:17:46 2020

Create an interface for layouts that can be opened

Create a common interface that represents layouts
that have two states: open and closed. This allows
higher level libraries to rely on the interface,
rather than concrete implementations such as
DrawerLayout, making them more resilient to
changes in the current recommended implementation.

Fixes: 129979320
Test: ./gradlew checkApi
Change-Id: I0f2a1414977825aa053c6555261f2b7d4417bd19

M customview/customview/api/1.1.0-alpha02.txt
M customview/customview/api/current.txt
M customview/customview/api/public_plus_experimental_1.1.0-alpha02.txt
M customview/customview/api/public_plus_experimental_current.txt
M customview/customview/api/restricted_1.1.0-alpha02.txt
M customview/customview/api/restricted_current.txt
A customview/customview/src/main/java/androidx/customview/widget/Openable.java
M drawerlayout/drawerlayout/api/1.1.0-alpha03.txt
M drawerlayout/drawerlayout/api/current.txt
M drawerlayout/drawerlayout/api/public_plus_experimental_1.1.0-alpha03.txt
M drawerlayout/drawerlayout/api/public_plus_experimental_current.txt
M drawerlayout/drawerlayout/api/restricted_1.1.0-alpha03.txt
M drawerlayout/drawerlayout/api/restricted_current.txt
M drawerlayout/drawerlayout/build.gradle
M drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
M jetifier/jetifier/migration.config
M slidingpanelayout/slidingpanelayout/api/1.1.0-alpha01.txt
M slidingpanelayout/slidingpanelayout/api/current.txt
M slidingpanelayout/slidingpanelayout/api/public_plus_experimental_1.1.0-alpha01.txt
M slidingpanelayout/slidingpanelayout/api/public_plus_experimental_current.txt
M slidingpanelayout/slidingpanelayout/api/restricted_1.1.0-alpha01.txt
M slidingpanelayout/slidingpanelayout/api/restricted_current.txt
M slidingpanelayout/slidingpanelayout/src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java

https://android-review.googlesource.com/940787

Issue 343249144