summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-01-14 20:37:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-14 20:37:37 +0000
commitc978470e72bceeb947b9ab201554f48b31200675 (patch)
tree8a9198e8cae4489eb68fbba2690eb860a239b0ec
parent2282b889503e0607afe782fe80d209ab96ffd92b (diff)
parent60a5acae7699a6b45c67354a0a0070e89bcb61f8 (diff)
downloadmockito-c978470e72bceeb947b9ab201554f48b31200675.tar.gz
Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094 am: f0ec16c204 am: 1082433307 am: 60a5acae76t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: I266cff9f1ea733be2405e02d9ee0f0d12c5b607a
-rw-r--r--Android.bp4
-rw-r--r--lib/byte-buddy-1.8.15-sources.jarbin959229 -> 0 bytes
-rw-r--r--lib/byte-buddy-1.8.15.jarbin2987269 -> 0 bytes
-rw-r--r--lib/byte-buddy-1.9.3-sources.jarbin0 -> 1141534 bytes
-rw-r--r--lib/byte-buddy-1.9.3.jarbin0 -> 3237047 bytes
-rw-r--r--lib/byte-buddy-1.9.3.jar.txt (renamed from lib/byte-buddy-1.8.15.jar.txt)0
-rw-r--r--lib/byte-buddy-agent-1.8.15-sources.jarbin18700 -> 0 bytes
-rw-r--r--lib/byte-buddy-agent-1.8.15.jarbin41740 -> 0 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3-sources.jarbin0 -> 21130 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3.jarbin0 -> 43413 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3.jar.txt (renamed from lib/byte-buddy-agent-1.8.15.jar.txt)0
11 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index d9dd1ee..fa02f9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,10 +108,10 @@ java_library_host {
// ============================================================
java_import_host {
name: "mockito-byte-buddy",
- jars: ["lib/byte-buddy-1.8.15.jar"],
+ jars: ["lib/byte-buddy-1.9.3.jar"],
}
java_import_host {
name: "mockito-byte-buddy-agent",
- jars: ["lib/byte-buddy-agent-1.8.15.jar"],
+ jars: ["lib/byte-buddy-agent-1.9.3.jar"],
}
diff --git a/lib/byte-buddy-1.8.15-sources.jar b/lib/byte-buddy-1.8.15-sources.jar
deleted file mode 100644
index 523015e..0000000
--- a/lib/byte-buddy-1.8.15-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-1.8.15.jar b/lib/byte-buddy-1.8.15.jar
deleted file mode 100644
index b8c8379..0000000
--- a/lib/byte-buddy-1.8.15.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-1.9.3-sources.jar b/lib/byte-buddy-1.9.3-sources.jar
new file mode 100644
index 0000000..400bdcb
--- /dev/null
+++ b/lib/byte-buddy-1.9.3-sources.jar
Binary files differ
diff --git a/lib/byte-buddy-1.9.3.jar b/lib/byte-buddy-1.9.3.jar
new file mode 100644
index 0000000..c1c2b07
--- /dev/null
+++ b/lib/byte-buddy-1.9.3.jar
Binary files differ
diff --git a/lib/byte-buddy-1.8.15.jar.txt b/lib/byte-buddy-1.9.3.jar.txt
index e06d208..e06d208 100644
--- a/lib/byte-buddy-1.8.15.jar.txt
+++ b/lib/byte-buddy-1.9.3.jar.txt
diff --git a/lib/byte-buddy-agent-1.8.15-sources.jar b/lib/byte-buddy-agent-1.8.15-sources.jar
deleted file mode 100644
index 24ab2ee..0000000
--- a/lib/byte-buddy-agent-1.8.15-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-agent-1.8.15.jar b/lib/byte-buddy-agent-1.8.15.jar
deleted file mode 100644
index 1709e55..0000000
--- a/lib/byte-buddy-agent-1.8.15.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-agent-1.9.3-sources.jar b/lib/byte-buddy-agent-1.9.3-sources.jar
new file mode 100644
index 0000000..cc30ed3
--- /dev/null
+++ b/lib/byte-buddy-agent-1.9.3-sources.jar
Binary files differ
diff --git a/lib/byte-buddy-agent-1.9.3.jar b/lib/byte-buddy-agent-1.9.3.jar
new file mode 100644
index 0000000..51a0bd4
--- /dev/null
+++ b/lib/byte-buddy-agent-1.9.3.jar
Binary files differ
diff --git a/lib/byte-buddy-agent-1.8.15.jar.txt b/lib/byte-buddy-agent-1.9.3.jar.txt
index e06d208..e06d208 100644
--- a/lib/byte-buddy-agent-1.8.15.jar.txt
+++ b/lib/byte-buddy-agent-1.9.3.jar.txt