Snap for 9991246 from 84b467507fe71da5c981dd747d94333b73418452 to udc-d1-release

Change-Id: Ib8d77b4efd9dc1e6890d23faa274a448e003db64

7 files changed, 21 insertions, 41 deletions

diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE
index d0fe5d7b..dc96892f 100644
--- a/bazel.WORKSPACE
+++ b/bazel.WORKSPACE
@@ -131,7 +131,7 @@ local_repository(
 # it can be properly vendored.
 local_repository(
     name = "rules_java",
-    path = "build/bazel/rules/java/rules_java",
+    path = "build/bazel_common_rules/rules/java/rules_java",
 )
 
 register_toolchains(
diff --git a/ci/determinism_test.sh b/ci/determinism_test.sh
index 47baafbf..622bc0e3 100755
--- a/ci/determinism_test.sh
+++ b/ci/determinism_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
 
 # Copyright (C) 2023 The Android Open Source Project
 #
@@ -33,6 +33,16 @@ if [[ -z ${DIST_DIR+x} ]]; then
   DIST_DIR="${OUT_DIR}/dist"
 fi
 
+if [[ -z ${TARGET_PRODUCT+x} ]]; then
+  echo "TARGET_PRODUCT not set. Using aosp_arm64"
+  TARGET_PRODUCT=aosp_arm64
+fi
+
+if [[ -z ${TARGET_BUILD_VARIANT+x} ]]; then
+  echo "TARGET_BUILD_VARIANT not set. Using userdebug"
+  TARGET_BUILD_VARIANT=userdebug
+fi
+
 UNAME="$(uname)"
 case "$UNAME" in
 Linux)
@@ -55,8 +65,8 @@ function clean_build {
     --mk-metrics \
     BAZEL_STARTUP_ARGS="--max_idle_secs=5" \
     BAZEL_BUILD_ARGS="--color=no --curses=no --show_progress_rate_limit=5" \
-    TARGET_PRODUCT=aosp_arm64 \
-    TARGET_BUILD_VARIANT=userdebug \
+    TARGET_PRODUCT=${TARGET_PRODUCT} \
+    TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} \
     nothing \
     dist DIST_DIR=$DIST_DIR
 }
@@ -65,6 +75,10 @@ function save_hash {
   local -r filepath="$1"
   find $OUT_DIR/soong/workspace -type f,l -iname "BUILD.bazel" -o -iname "*.bzl" | xargs "${PREBUILTS}"/md5sum > $filepath
   find $OUT_DIR/soong/soong_injection -type f,l | xargs "${PREBUILTS}"/md5sum >> $filepath
+  "${PREBUILTS}"/md5sum $OUT_DIR/soong/Android-${TARGET_PRODUCT}.mk >> $filepath
+  if [[ -z ${SKIP_NINJA_CHECK+x} ]]; then
+    "${PREBUILTS}"/md5sum $OUT_DIR/soong/build.ninja >> $filepath
+  fi
 }
 
 TESTDIR=$(mktemp -t testdir.XXXXXX -d)
diff --git a/rules/java/rules_java/BUILD b/rules/java/rules_java/BUILD
deleted file mode 100644
index e69de29b..00000000
--- a/rules/java/rules_java/BUILD
+++ /dev/null
diff --git a/rules/java/rules_java/WORKSPACE b/rules/java/rules_java/WORKSPACE
deleted file mode 100644
index e69de29b..00000000
--- a/rules/java/rules_java/WORKSPACE
+++ /dev/null
diff --git a/rules/java/rules_java/java/BUILD b/rules/java/rules_java/java/BUILD
deleted file mode 100644
index ee5ee6b2..00000000
--- a/rules/java/rules_java/java/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
-bzl_library(
-    name = "rules",
-    srcs = ["defs.bzl"],
-    visibility = ["//visibility:public"],
-)
diff --git a/rules/java/rules_java/java/defs.bzl b/rules/java/rules_java/java/defs.bzl
deleted file mode 100644
index 5c9ec57d..00000000
--- a/rules/java/rules_java/java/defs.bzl
+++ /dev/null
@@ -1,29 +0,0 @@
-def java_binary(**attrs):
-    native.java_binary(**attrs)
-
-def java_import(**attrs):
-    native.java_import(**attrs)
-
-def java_library(**attrs):
-    native.java_library(**attrs)
-
-def java_lite_proto_library(**attrs):
-    native.java_lite_proto_library(**attrs)
-
-def java_proto_library(**attrs):
-    native.java_proto_library(**attrs)
-
-def java_test(**attrs):
-    native.java_test(**attrs)
-
-def java_package_configuration(**attrs):
-    native.java_package_configuration(**attrs)
-
-def java_plugin(**attrs):
-    native.java_plugin(**attrs)
-
-def java_runtime(**attrs):
-    native.java_runtime(**attrs)
-
-def java_toolchain(**attrs):
-    native.java_toolchain(**attrs)
diff --git a/scripts/incremental_build/canonical_perf.sh b/scripts/incremental_build/canonical_perf.sh
index dc2a750a..97e47d43 100755
--- a/scripts/incremental_build/canonical_perf.sh
+++ b/scripts/incremental_build/canonical_perf.sh
@@ -40,11 +40,13 @@ done
 shift $((OPTIND - 1))
 readonly -a build_types=("$@")
 
+log_dir=${log_dir:-"$TOP/../timing-$(date +%b%d-%H%M)"}
+
 function build() {
   date
   set -x
   if ! "$TOP/build/bazel/scripts/incremental_build/incremental_build.sh" \
-    --ignore-repo-diff ${log_dir:+--log-dir "$log_dir"} \
+    --ignore-repo-diff --log-dir "$log_dir" \
     ${build_types:+--build-types "${build_types[@]}"} \
     "$@"; then
     echo "See logs for errors"