diff options
| author | Khaled Ramadan Hussein <khalidramadan@google.com> | 2023-10-13 12:36:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-13 12:36:51 +0000 |
| commit | 1cb8fdcd9f6cf7e68d1dae63cc46d7b83263d73e (patch) | |
| tree | d06cf8c4461f82da3b02b365171afdf7126e0340 | |
| parent | 0bde1f81dcb0f68a8ae1a1b81cd40db59561bfbc (diff) | |
| parent | 2e14556517727c08e47130d7671d42b8b4c0dc62 (diff) | |
| download | misc-1cb8fdcd9f6cf7e68d1dae63cc46d7b83263d73e.tar.gz | |
Merge "Update prebuilt platform protos for recent statsd changes." into main am: 0b679bfd3b am: 8dcf134206 am: 3dc14f419e am: 2e14556517
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2786464
Change-Id: I8634282b35f35a5aa7aec5d5f59f9f5c9104fa38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |