Snap for 7623707 from dbee66a0677c9cca067f3d7c73548234b2a28a59 to s-keystone-qcom-release

Change-Id: I5515b2d1f209a6e2fa1485c4759b2e5e6f7230e9

4 files changed, 21 insertions, 13 deletions

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index c9830cf088..08aaaefa8f 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3619,9 +3619,9 @@ void Heap::GrowForUtilization(collector::GarbageCollector* collector_ran,
           current_gc_iteration_.GetFreedRevokeBytes();
       // Bytes allocated will shrink by freed_bytes after the GC runs, so if we want to figure out
       // how many bytes were allocated during the GC we need to add freed_bytes back on.
-      CHECK_GE(bytes_allocated + freed_bytes, bytes_allocated_before_gc);
-      const size_t bytes_allocated_during_gc = bytes_allocated + freed_bytes -
-          bytes_allocated_before_gc;
+      // Almost always bytes_allocated + freed_bytes >= bytes_allocated_before_gc.
+      const size_t bytes_allocated_during_gc =
+          UnsignedDifference(bytes_allocated + freed_bytes, bytes_allocated_before_gc);
       // Calculate when to perform the next ConcurrentGC.
       // Estimate how many remaining bytes we will have when we need to start the next GC.
       size_t remaining_bytes = bytes_allocated_during_gc;
diff --git a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
index 52456984e4..add31997ae 100644
--- a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
@@ -261,19 +261,22 @@ public class OnDeviceSigningHostTest extends BaseHostJUnit4Test {
             final long firstField = Long.parseLong(firstUpdateEntry[i]);
             final long secondField = Long.parseLong(secondUpdateEntry[i]);
             if (i == LAST_UPDATE_MILLIS_INDEX) {
-                // The second APEX lastUpdateMillis should be after the first.
+                // The second APEX lastUpdateMillis should be after the first, but a clock
+                // adjustment might reverse the order so we can't assert this (b/194365586).
                 assertTrue(
-                        "Last update time same or wrong relation" +
-                        firstField + " >= " + secondField,
-                        firstField < secondField);
+                        "Last update times are expected to differ, but they are equal " +
+                        firstField + " == " + secondField,
+                        firstField != secondField);
             } else if (i == COMPILATION_TIME_INDEX) {
-                // Second compilation time should be after the first compilation time.
+                // The second compilation time should be after the first compilation time, but
+                // a clock adjustment might reverse the order so we can't assert this
+                // (b/194365586).
                 assertTrue(
-                        "Compilation time same or wrong relation" +
-                        firstField + " >= " + secondField,
-                        firstField < secondField);
+                        "Compilation times are expected to differ, but they are equal " +
+                        firstField + " == " + secondField,
+                        firstField != secondField);
             } else {
-                // The remaining fields should be the same, ie trigger for compilation, status, etc
+                // The remaining fields should be the same, ie trigger for compilation.
                 assertTrue(
                         "Compilation entries differ for position " + i + ": " +
                         firstField + " != " + secondField,
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index a285e78b1e..3fe9bac545 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -869,6 +869,8 @@ class Generator:
         "CtsLibcoreJsr166TestCases",
         "CtsLibcoreLegacy22TestCases",
         "CtsLibcoreOjTestCases",
+        "CtsLibcoreWycheproofBCTestCases",
+        "MtsLibcoreOkHttpTestCases",
     ]
     other_cts_libcore_tests_shard = self.create_mts_test_shard(
         "CTS Libcore OJ tests", other_cts_libcore_tests_shard_tests,
diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh
index ad7e7bd48f..3c5a68f0aa 100755
--- a/tools/build_linux_bionic.sh
+++ b/tools/build_linux_bionic.sh
@@ -31,7 +31,10 @@ if [ ! -d art ]; then
   exit 1
 fi
 
-soong_args=""
+# TODO(b/194433871): Set MODULE_BUILD_FROM_SOURCE to disable prebuilt modules,
+# which Soong otherwise can create duplicate install rules for in --skip-make
+# mode.
+soong_args="MODULE_BUILD_FROM_SOURCE=true"
 
 # Switch the build system to unbundled mode in the reduced manifest branch.
 if [ ! -d frameworks/base ]; then