Update git submodules
* Update frameworks/support from branch 'androidx-master-dev'
to be0ee780f0131219ca135e56de5a14ab8498894f
- Merge changes from topic "gradlew-wrapper" into androidx-master-dev
* changes:
build_log_simplifier.py support to auto-update the list of exempt messages
build_log_simplifier.py now adding new suggested exemptions near existing exemptions
build_log_simplifier.py ignoring blank lines before the first task too
build_log_processor saving CHECKOUT into log file
build_log_simplifier now matching regexes more quickly
build_log_simplifier.py support to suggest slightly generalized regexes
build_log_simplifier.py support to suggest new suppressions
build_log_simplifier support to load ignore regexes from a file
build_log_simplifier.py now normalizing OUT_DIR, DIST_DIR, source root, and checkout root
gradlew support to call development/build_log_simplifier.py
- build_log_simplifier.py support to auto-update the list of exempt messages
Bug: 140635374
Test: ./build_log_simplifier.py --update /tmp/log && git status build_log_simplifier/messages.ignore
Change-Id: I3c8b5a95b7053e2274100067b7be47fd65d16348
- build_log_simplifier.py now adding new suggested exemptions near existing exemptions
so that if a task creates more output in the future, the exemption for each line will be near each other
Also, this change adds the task names into the exemptions file, to make it easier to recognize which task created the message
Also, this change renames "suppression" to "exemption"
Bug: 140635374
Test: ./test.py
Change-Id: If4537601a01b81790cf9b44d5f88e474f1de3793
- build_log_simplifier.py ignoring blank lines before the first task too
Bug: 140635374
Test: ./cleanBuild.sh -y buildOnServer -Pandroidx.validateNoExtraMessages # still doesn't succeed, but it doesn't complain about any initial blank lines
Change-Id: I0bcae0e02b8af6d3ad2628cdb479d37a5d7235af
- build_log_processor saving CHECKOUT into log file
to make it easy to download log files from the build server and to run build_log_simplifier.py against the result
Bug: 140635374
Test: ./cleanBuild.sh -y :help -Pandroidx.validateNoExtraMessages # and see that although it fails because the :help messages are unrecognized, this message containing an absolute filepath:
"Downloading file:/usr/local/google/workspace/aosp-androidx-git/frameworks/support/gradle/wrapper/../../../../tools/external/gradle/gradle-6.5.1-bin.zip"
is recognized and is treated as exempt
Change-Id: I68d756fb9432dc2a35c900034ab2b20b9cc354ae
- build_log_simplifier now matching regexes more quickly
This reduces the runtime from 6s to 1s, given 33371 lines in the log and 948 lines in the ignore file
Bug: 140635374
Test: time /usr/local/google/workspace/aosp-androidx-git/frameworks/support/development/build_log_simplifier.py --validate /usr/local/google/workspace/aosp-androidx-git/out/dist/gradle.log
Change-Id: I8aecce2535ed5b08cc7a1214b3f6b90cfe12529e
- build_log_simplifier.py support to suggest slightly generalized regexes
Bug: 140635374
Test: ./cleanBuild.sh -y buildOnServer -Pandroidx.validateNoExtraMessages # and see that it generates a suggested .ignore file containing regexes
Change-Id: I58035d429944275935ec4b4e9824caeedb62eeb0
- build_log_simplifier.py support to suggest new suppressions
To make it easier to add new suppressions when appropriate
Bug: 140635374
Test: ./gradlew --rerun-tasks :core:core:assembleDebug -Pandroidx.validateNoExtraMessages; \
cp ../../out/dist/gradle.log.ignore development/build_log_simplifier/messages.ignore && \
./gradlew --rerun-tasks :core:core:assembleDebug -Pandroidx.validateNoExtraMessages
Change-Id: I8a421dd30b7d543b60a4b206e59bef46c62cca74
- build_log_simplifier support to load ignore regexes from a file
In preparation for adding support to automatically suggest more regexes to add
Bug: 1409230
Test: ./gradlew :support-preference-demos:lintDebug -Pandroidx.validateNoExtraMessages # and see that the output summary at the bottom does not mention 'Lint found 3 warnings (1 error filtered by baseline lint-baseline.xml)'
Change-Id: I9e0db617cf3c4fcb76eaf7d53b386a418f806c7a
- build_log_simplifier.py now normalizing OUT_DIR, DIST_DIR, source root, and checkout root
to make it easier to simplify or skip some messages
Bug: 140635374
Test: OUT_DIR=../../out DIST_DIR=../../out/dist ./gradlew publicDocsTask -Pandroidx.validateNoExtraMessages # and see that the output summary contains warnings messages referring to files in '$OUT_DIR' rather than in /usr/local/google/workspace/aosp-androidx-git/out
Change-Id: If09dfb962c9cddc3aa48fc7c20a3c0ab0e14e1bf
- gradlew support to call development/build_log_simplifier.py
To make it easier to test locally for when it can start validating the contents of the log file
Bug: 140635374
Test: ./gradlew projects && echo ok
Test: ./gradlew nonexistenttask && echo nope # and see that this fails
Test: echo syntaxerror > core/core/src/main/java/androidx/core/app/AppComponentFactory.java \
&& ./gradlew :core:core:assembleDebug -Pandroidx.summarizeStderr --stacktrace
# and see that this fails but that the stacktrace is short
Test: ./busytown/androidx.sh nonexistenttask # and see that this fails with a stacktrace but that it is short
Test: STUDIO_DIR=/mnt/fastroid/workspace/studio-master ./aosp-androidx-git/frameworks/support/busytown/androidx-studio-integration.sh
Test: echo syntaxerror > ./aosp-androidx-git/frameworks/support/core/core/src/main/java/androidx/core/app/AppComponentFactory.java && \
STUDIO_DIR=/mnt/fastroid/workspace/studio-master ./aosp-androidx-git/frameworks/support/busytown/androidx-studio-integration.sh # and see that this fails with a stacktrace
Test: ./gradlew :core:core:assembleDebug -Pandroidx.validateNoExtraMessages # and see that this fails, saying that extra messages were output
Test: treehugger runs busytown/androidx.sh
Change-Id: I15619309d11234b0868571d8c80211af080b236c
1 file changed
