aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa to ↵aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-releaseAndroid Build Coastguard Worker
mainline-uwb-release Change-Id: I7eb98db754812f5fcaa6014572dba97a129a4f2e
2023-02-09Pin tradefed dependencies to Java 11 am: 10b49a6baf am: 9e93c83469 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseSorin Basca
f89a845c40 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2419358 Change-Id: Ifcef5d4a23b3386debcc72ea3071e34c916d170a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Pin tradefed dependencies to Java 11 am: 10b49a6baf am: 9e93c83469Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2419358 Change-Id: I767c56c397d6954fc38068de83c337fec723b4ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Pin tradefed dependencies to Java 11 am: 10b49a6bafandroid-u-beta-1-gplSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2419358 Change-Id: I899b762088c1b3800e7c4fdd4aafe27e348d8ed8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-04Pin tradefed dependencies to Java 11Sorin Basca
Bug: 267831518 Test: TH Change-Id: I2c337d980643dfbe7518fe78f21aa01d8999b090
2022-12-16[automerger skipped] Specify min_sdk_version so it can be used with APEX. ↵Alex Buynytskyy
am: c381ccc21c am: 1e505f1880 am: e380275aa7 -s ours am skip reason: Merged-In Ie76742179a74fb4e79e4ab9b9480cf315c238376 with SHA-1 eeb26ecf7a is already in history Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2360920 Change-Id: Ie63605120b0d514902e7928ad63026a8a23bb344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Specify min_sdk_version so it can be used with APEX. am: c381ccc21c am: ↵Alex Buynytskyy
1e505f1880 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2360920 Change-Id: I8ff31a9f1f6a6b662eea2c9a5ebe57245c13c173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Specify min_sdk_version so it can be used with APEX. am: c381ccc21cAlex Buynytskyy
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2360920 Change-Id: I8b148c90868f611cefcc3fac0607293fd3f7659c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15Specify min_sdk_version so it can be used with APEX.main-16k-with-phonesAlex Buynytskyy
Bug: 262758740 Test: builds Change-Id: Ie76742179a74fb4e79e4ab9b9480cf315c238376 Merged-In: Ie76742179a74fb4e79e4ab9b9480cf315c238376
2022-12-16Specify min_sdk_version so it can be used with APEX.Alex Buynytskyy
Ignore-AOSP-First: topic contains both AOSP and non-AOSP changes, will cherry-pick to AOSP Bug: 262758740 Test: builds Change-Id: Ie76742179a74fb4e79e4ab9b9480cf315c238376 Merged-In: Ie76742179a74fb4e79e4ab9b9480cf315c238376
2022-11-15Allow opencensus to be used by com.android.devicelock.Amos Bianchi
Bug: 258849404 Test: Build log does not show missing classes. Change-Id: I86af47f79571cbc8c64cd09b3fedb990ac012bf2
2021-12-19Remove log4j and its references from opencensus am: 8fd12cb94e am: ↵t_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_331131000main-16kandroid13-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_332714010Guang Zhu
1109620313 am: 1a0247bd40 am: ef47135fc4 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1927168 Change-Id: I04aed30b35d36a3bdef9c01125175f53b7199297
2021-12-19Remove log4j and its references from opencensus am: 8fd12cb94e am: ↵Guang Zhu
1109620313 am: 1a0247bd40 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1927168 Change-Id: I020778e9202ca155e9ec5e6c790cf6d52484936c
2021-12-19Remove log4j and its references from opencensus am: 8fd12cb94e am: 1109620313Guang Zhu
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1927168 Change-Id: I00faaace8b5ad9fc460e497d59582219d9e60b5a
2021-12-19Remove log4j and its references from opencensus am: 8fd12cb94eGuang Zhu
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1927168 Change-Id: Ic9fdd20f221cc0cff417186a3f155a290bfd1450
2021-12-19Remove log4j and its references from opencensusandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Guang Zhu
Remove code and references to log4j from opencensus to comply with exit requirements for security vulnerability. This particular functionality is not in use anyways. Bug: 210322427 Test: compile Change-Id: I0fc063d688e438ae4b9cc001d071b1d1f1ba6e81
2021-09-22Remove external/opencensus-java/.gitmodules and submodule directories. am: ↵Raman Tenneti
ac79827f1c am: 8e731716d3 am: 5668bced78 am: d74e0023e1 am: 25e068999f Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1830699 Change-Id: I3ecff914fad2d0a38fcd73382e6bf4a87a0a67b0
2021-09-22Remove external/opencensus-java/.gitmodules and submodule directories. am: ↵Raman Tenneti
ac79827f1c am: 8e731716d3 am: 5668bced78 am: d74e0023e1 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1830699 Change-Id: If18f27c79b227eab743c3a43a3e4586a701e41a2
2021-09-22Remove external/opencensus-java/.gitmodules and submodule directories. am: ↵Raman Tenneti
ac79827f1c am: 8e731716d3 am: 5668bced78 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1830699 Change-Id: I1d2f6b158881bd79368c5b6713428dd4da6e6b1d
2021-09-22Remove external/opencensus-java/.gitmodules and submodule directories. am: ↵Raman Tenneti
ac79827f1c am: 8e731716d3 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1830699 Change-Id: Iaa071d0438baecfc3ec732e648802a982bd15266
2021-09-22Remove external/opencensus-java/.gitmodules and submodule directories. am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Raman Tenneti
ac79827f1c Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1830699 Change-Id: Ie8cc00b6258447bd37df7fb0dfa81069034dac2a
2021-09-17Remove external/opencensus-java/.gitmodules and submodule directories.Raman Tenneti
git doesn't support submodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: I8b3f640af03833ab6e32739f530ef9915183a5d7
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ib7d30fa6abb809480c4467f0ff90186a869ffecc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 72e65f5df5 -s ours am: 6025bed211 -s ours am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d3e01bcbf959a31e57b56721befe4b357264452
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -s ↵Xin Li
ours am: 72e65f5df5 -s ours am: 6025bed211 -s ours am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5e2ac739056926a328b057f2b7428f5ce930aba
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: 72e65f5df5 -s ours am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied2fc4af1023b08a1e660ebd26ff594da732acaf
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -s oursXin Li
am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d4aa6774b10924390f231d6178187c5d9910642
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I1803299b3be7e08fa7086cb04cff4003cbd8527e Change-Id: I8e187a5b85f39b8bec728b842f10d89ad3709b7a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 am: 5038285319 am: 5760e6616f Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib426e750a2ad6630ff684808cabf659998c0f634
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 am: 5038285319 am: 5760e6616f Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2a1b213b12d993216feb8d36f8179fcafb36182
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 am: 5038285319 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief097f6ef72ed8448a83580c56fd2abbf8ff31ca
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4bed24fc237fa983f50d458df9a4d8dd1b3c7eb6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53daBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10afa9b563d74b3d10564de3bf2f54ae1c183c90
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-javaandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp api/Android.bp contrib/grpc_metrics/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2a093f420186f13dd1602434dcffd7e1a36846c7
2020-11-24Mark ab/6881855 as merged am: 09b5614f0e am: 8186814f93Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/13110949 Change-Id: Icfeff448376a36e3edb1d1f5035936eb89d8088f
2020-11-24Mark ab/6881855 as merged am: 09b5614f0eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/13110949 Change-Id: I1803299b3be7e08fa7086cb04cff4003cbd8527e
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I2de02ad2bce7a5473bf8dd18e9805c1629c086ee
2020-11-19Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b am: 49327a8aa1 am: 0c9753c87f Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: I60d49eabd5f64d10ef3ced81146ef7a0e5e637ed
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b am: 49327a8aa1 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: I53e4f342ee466152f3c0df569cb402b6b2cbaf52
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: Ia13afcb1188ef09d250400e462412c67c3c84062
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: Ia7a963ef61628e24c9819d5ffedd4c36253025c8
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants.Karl Shaffer
Migrates the opencensus-java-contrib-grpc-metrics and opencensus-java-api from a java_library_host target to a java_library target that builds both an Android and Host target. For the Android target, ensures that the library is built against the latest public APIs. Test: m opencensus-java-contrib-grpc-metrics Test: m opencensus-java-api Change-Id: I7723daedd338b516cef6daccb41b7eeafec49c72
2020-11-02[automerger skipped] Merge "Add METADATA to opencensus-java: Apache2=NOTICE ↵David Dietrich
am: 4a30687337" into mainline-prod am: 72badb3fe9 -s ours am skip reason: Change-Id Ie50f27b6d5f402754543ae7c05991a72a4b51d59 with SHA-1 4a30687337 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12797626 Change-Id: Ic2da0e890f7972e8c00a6931f9e3589f4ad2f5f0
2020-11-02[automerger skipped] Merge "Add OpenCensus build modules required for gRPC" ↵David Dietrich
into mainline-prod am: 206703a605 -s ours am skip reason: Change-Id Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 with SHA-1 9bc011a365 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12496861 Change-Id: I75c0e424e5db110258d30fc57db304d15030f5fc
2020-11-02[automerger skipped] Resolve merge conflicts am: b4905437c8 -s oursChen Zhu
am skip reason: Change-Id Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 with SHA-1 9bc011a365 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12484188 Change-Id: I9118da7d51f2f647828d6ef1cd24b1a345c358ee
2020-11-02Merge "Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337" into ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseDavid Dietrich
mainline-prod
2020-11-02Merge "Add OpenCensus build modules required for gRPC" into mainline-prodDavid Dietrich
2020-11-02Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337Bob Badour
Exempt-From-Owner-Approval: cp of submitted change, needed for rebase Change-Id: I48ea9fe2fba75d6aafcc750d759dba6012e47b6d (cherry picked from commit 433bb01e7f0041e39ae5ae36e50c34e03e6f3639) Merged-In: Ie50f27b6d5f402754543ae7c05991a72a4b51d59
2020-11-02Add OpenCensus build modules required for gRPCHadrien Zalek
Add Soong build modules that are required compile-time and runtime dependencies of gRPC Java client libraries. Note that the current grpc-java-core module is imported which explains why there are no build-time errors. Test: m opencensus-java-api && m opencensus-java-contrib-grpc-metrics Bug: 148404241 Exempt-From-Owner-Approval: rebase, cp of change in other branch Change-Id: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 Merged-In: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7
2020-11-02Resolve merge conflictsChen Zhu
Bug: 166133969 Test: m Exempt-From-Owner-Approval: rebase Change-Id: I833f4970233abf074303e1bd9cf26d1e3efdcef4 Merged-In: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 00:10:02 +0000