[go: nahoru, domu]

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
diff --git a/busytown/androidx-studio-integration.sh b/busytown/androidx-studio-integration.sh
index d63fc9d..ab05328 100755
--- a/busytown/androidx-studio-integration.sh
+++ b/busytown/androidx-studio-integration.sh
@@ -34,12 +34,12 @@
 export JAVA_TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
 export LINT_PRINT_STACKTRACE=true
 
-LOG_SIMPLIFIER="$SCRIPT_DIR/../development/build_log_simplifier.sh"
-
 function buildAndroidx() {
-  "$LOG_SIMPLIFIER" $gw -p frameworks/support --no-daemon listTaskOutputs && \
-  "$LOG_SIMPLIFIER" $gw -p frameworks/support --no-daemon bOS --stacktrace -Pandroidx.allWarningsAsErrors -PverifyUpToDate && \
-  "$LOG_SIMPLIFIER" DIST_SUBDIR="/ui" $gw -p frameworks/support/ui --no-daemon bOS --stacktrace -Pandroidx.allWarningsAsErrors -PverifyUpToDate
+  LOG_PROCESSOR="$SCRIPT_DIR/../development/build_log_processor.sh"
+  properties="-Pandroidx.summarizeStderr --no-daemon -Pandroidx.allWarningsAsErrors"
+  "$LOG_PROCESSOR"                   $gw $properties -p frameworks/support    listTaskOutputs && \
+  "$LOG_PROCESSOR"                   $gw $properties -p frameworks/support    bOS --stacktrace -PverifyUpToDate && \
+  "$LOG_PROCESSOR" DIST_SUBDIR="/ui" $gw $properties -p frameworks/support/ui bOS --stacktrace -PverifyUpToDate
 }
 
 function exportTransformsDir() {