diff options
author | Khaled Ramadan Hussein <khalidramadan@google.com> | 2023-10-13 10:24:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-13 10:24:30 +0000 |
commit | 0b679bfd3b956883d3110541865b665becade583 (patch) | |
tree | c56f38f4be2467fd8df60e8e8e25580ede4119fa | |
parent | ab2bd7e20294e57176ecb65c1c82972c9e64e36a (diff) | |
parent | 9a0054735041e7c103beeb04ab7d6631a4710820 (diff) | |
download | misc-0b679bfd3b956883d3110541865b665becade583.tar.gz |
Merge "Update prebuilt platform protos for recent statsd changes." into mainandroid-u-qpr1-beta-2.2_r0.6android-u-qpr1-beta-2.2_r0.5android-u-qpr1-beta-2.2_r0.4android-u-qpr1-beta-2.2_r0.3android-14.0.0_r0.25android-14.0.0_r0.23android-14.0.0_r0.21android-gs-tangorpro-5.10-android14-qpr1-betaandroid-gs-pantah-5.10-android14-qpr1-betaandroid-gs-lynx-5.10-android14-qpr1-betaandroid-gs-felix-5.10-android14-qpr1-beta
-rw-r--r-- | common/frameworks/PREBUILT | 4 | ||||
-rw-r--r-- | common/frameworks/platformprotos-prebuilt.jar | bin | 26409961 -> 30232356 bytes | |||
-rw-r--r-- | common/frameworks/platformtestprotos-prebuilt.jar | bin | 11875005 -> 15422366 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/common/frameworks/PREBUILT b/common/frameworks/PREBUILT index d891e6fd..1fb3364e 100644 --- a/common/frameworks/PREBUILT +++ b/common/frameworks/PREBUILT @@ -4,10 +4,10 @@ The objects in this prebuilt directory can be built from Both are built using the aosp_arm64 variant. platformprotos-prebuilt.jar: -Built from commit 901eda31b02ed684da614870f9d44e202129ede9. +Built from commit ef2cbcd7c39298c6d4cb8cf43d995932d82531b2. platformtestprotos-prebuilt.jar: -Built from commit 901eda31b02ed684da614870f9d44e202129ede9. +Built from commit ef2cbcd7c39298c6d4cb8cf43d995932d82531b2. Note: Before dropping the jars, please run the following command to strip the jar manifest file, which causes hidden dependency on jars in the Class-Path. diff --git a/common/frameworks/platformprotos-prebuilt.jar b/common/frameworks/platformprotos-prebuilt.jar Binary files differindex fd8ed2cd..7546bec7 100644 --- a/common/frameworks/platformprotos-prebuilt.jar +++ b/common/frameworks/platformprotos-prebuilt.jar diff --git a/common/frameworks/platformtestprotos-prebuilt.jar b/common/frameworks/platformtestprotos-prebuilt.jar Binary files differindex 16ed30a0..b9b9af9d 100644 --- a/common/frameworks/platformtestprotos-prebuilt.jar +++ b/common/frameworks/platformtestprotos-prebuilt.jar |