Fixed
Status Update
Comments
ma...@google.com <ma...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-master-dev
commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019
Change the way to detect mismatch between POJO and query
This fixes cursor mismatch warnings with expandProjection.
Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt
https://android-review.googlesource.com/1123258
https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1
Branch: androidx-master-dev
commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019
Change the way to detect mismatch between POJO and query
This fixes cursor mismatch warnings with expandProjection.
Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt
ma...@google.com <ma...@google.com> #3
ml...@google.com <ml...@google.com> #4
Project: platform/frameworks/support
Branch: androidx-master-dev
commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020
Re-factor how errors are dismissed when query is re-written
This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically ( b/140759491 ).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.
This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.
Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f
M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
https://android-review.googlesource.com/1288456
Branch: androidx-master-dev
commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020
Re-factor how errors are dismissed when query is re-written
This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.
This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.
Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f
M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
ap...@google.com <ap...@google.com> #5
Project: platform/frameworks/support
Branch: androidx-main
commit 9c2a871ca8804f5dcf680a7f772f7050198408df
Author: Marcello Albano <maralb@google.com>
Date: Mon Apr 08 16:35:50 2024
Override build type props when build types already exist
It's currently possible to customize release build types creating
benchmark and nonMinified build types. For example to customize
`release` it's possible to create `benchmarkRelease` and
`nonMinifiedRelease`. This PR makes sure that even when they're
customized, properties that would break baseline profile generation are
overridden. This PR also makes sure that the signing config is copied
from the release build type to the extended ones.
Relnote: "when customizing a nonMinified or benchmark build type,
ensure that properties that are needed to make baseline profile
generation and benchmark working are overridden."
Test: ./gradlew :benchmark:benchmark-baseline-profile-gradle-plugin:test
Bug: 324837887
Change-Id: Ib8f0555001ff719f4b82c35cf50c13b4a3fa308d
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/apptarget/BaselineProfileAppTargetPlugin.kt
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/BuildTypes.kt
M benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/apptarget/BaselineProfileAppTargetPluginTest.kt
https://android-review.googlesource.com/3032806
Branch: androidx-main
commit 9c2a871ca8804f5dcf680a7f772f7050198408df
Author: Marcello Albano <maralb@google.com>
Date: Mon Apr 08 16:35:50 2024
Override build type props when build types already exist
It's currently possible to customize release build types creating
benchmark and nonMinified build types. For example to customize
`release` it's possible to create `benchmarkRelease` and
`nonMinifiedRelease`. This PR makes sure that even when they're
customized, properties that would break baseline profile generation are
overridden. This PR also makes sure that the signing config is copied
from the release build type to the extended ones.
Relnote: "when customizing a nonMinified or benchmark build type,
ensure that properties that are needed to make baseline profile
generation and benchmark working are overridden."
Test: ./gradlew :benchmark:benchmark-baseline-profile-gradle-plugin:test
Bug: 324837887
Change-Id: Ib8f0555001ff719f4b82c35cf50c13b4a3fa308d
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/apptarget/BaselineProfileAppTargetPlugin.kt
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt
M benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/utils/BuildTypes.kt
M benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/apptarget/BaselineProfileAppTargetPluginTest.kt
ma...@google.com <ma...@google.com> #6
This is a summary of how build type configuration works:
buildTypes {
release {
...
}
benchmarkRelease {
// Properties for benchmark release can be overridden here.
// It's also possible to specify a different signing config.
}
nonMinifiedRelease {
// Properties for nonMinifiedRelease can be specified here.
//
// From 1.2.5 and 1.3.0-alpha04, the following properties are always overridden to avoid breaking baseline profile generation:
//
// isJniDebuggable = false
// isDebuggable = false
// isMinifyEnabled = false
// isShrinkResources = false
// isProfileable = true
// enableAndroidTestCoverage = false
// enableUnitTestCoverage = false
//
// It's still possible to specify a different signing config.
}
}
Description
Baseline Profile Gradle Plugin (BPGP) creates custom build types that are properly set up to generate optimal baseline profiles.
There's no way though to tweak the configuration to app's specific needs and prevent creating duplicate confusing build types.
Consider the example from Now in Android where each build type added
applicationIdSuffix
.Either the application has duplicate build types
benchmarkBenchmark
, or there's no way to defineapplicationIdSuffix
inbenchmark
build type generated by BPGP.I think we should allow developers telling BPGP to either: a) define their own
benchmark
build type b) allowing customization of thebenchmark
build type created by BPGP.