diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-02 04:08:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-02 04:08:17 +0000 |
| commit | 20f791597820308429d9571bd66f688761e7d707 (patch) | |
| tree | 57ceffa8948da5ad129e9bb7b11afe8f2079b13d /apex | |
| parent | 965148c3eb353420e856046c55dd6d1287ae7327 (diff) | |
| parent | caf3676945bb4a32f5fe2a6c626c489553c4d569 (diff) | |
Merge "Determine GC type based on BUILT_KERNEL_VERSION_FILE." into main am: d8cb9505f8 am: caf3676945
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2919746
Change-Id: Ia47b99536c2198b166ba1b24b7b075069284c044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/dexpreopt_bootjars_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apex/dexpreopt_bootjars_test.go b/apex/dexpreopt_bootjars_test.go index d9ab8fa60..7a17f501c 100644 --- a/apex/dexpreopt_bootjars_test.go +++ b/apex/dexpreopt_bootjars_test.go @@ -164,6 +164,7 @@ func TestDexpreoptBootJarsWithSourceArtApex(t *testing.T) { "out/soong/dexpreopt_arm64/dex_bootjars_input/baz.jar", "out/soong/.intermediates/art-bootclasspath-fragment/android_common_apex10000/art-bootclasspath-fragment/boot.prof", "out/soong/.intermediates/default/java/dex_bootjars/android_common/boot/boot.prof", + "out/soong/dexpreopt/uffd_gc_flag.txt", } expectedOutputs := []string{ @@ -201,6 +202,7 @@ func TestDexpreoptBootJarsWithPrebuiltArtApex(t *testing.T) { "out/soong/dexpreopt_arm64/dex_bootjars_input/baz.jar", "out/soong/.intermediates/prebuilt_com.android.art.deapexer/android_common/deapexer/etc/boot-image.prof", "out/soong/.intermediates/default/java/dex_bootjars/android_common/boot/boot.prof", + "out/soong/dexpreopt/uffd_gc_flag.txt", } expectedOutputs := []string{ |