aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-21Merge "Remove 1.3s "Waiting for Debugger" delay"main-16k-with-phonesFabien Sanglard
2022-12-17Reland (aosp/2320257). Add JDWP metrics to DDM trafficFabien Sanglard
Record processing start and duration for each cmd. Flush the content of the timing buffer when it is full. At the end of the session, (identified by VM::Exit cmd), also flush. The timing data is sent over a DDM packet with all the metrics recorded to allow debugger performance profiling. Bug: NA Test: Used the following steps, mkdir master-art; cd master-art repo init -u https://android.googlesource.com/platform/manifest -b master-art --partial-clone --clone-filter=blob:limit=10M . build/envsetup.sh lunch armv8-eng art/tools/buildbot-build.sh --host art/tools/run-libjdwp-tests.sh --mode=host --test org.apache.harmony.jpda.tests.jdwp.VirtualMachine_ExitTest#testExit001 Change-Id: Ic6198975710ae11dd00e84549ed51eabf679d6bc
2022-12-08Revert "Add JDWP metrics to DDM traffic" am: 2c20694af7Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2335482 Change-Id: I079227df1c9588e1cf84ec8197520e4ead39e863 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Revert "Add JDWP metrics to DDM traffic"Nicolas Geoffray
This reverts commit bfdde81372dd9060e52e2aeb1fd77990283c1f5e. Reason for revert: Potential culprit for org.apache.harmony.jpda.tests.jdwp.VirtualMachine_ExitTest#testExit001 failure Change-Id: Icdb08a2e400d92f125547e1c7998f1df5bbe5bd9
2022-12-07Add JDWP metrics to DDM traffic am: bfdde81372Fabien Sanglard
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2320257 Change-Id: I8801506636f8ec87feff471fe4907659c7ddc30f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Remove 1.3s "Waiting for Debugger" delayFabien Sanglard
Remove arbitrary loop when a debugged app starts. Instead for waiting for 1.3 seconds, we instruct oj-jdwplib to suspendfor all the threads and sent VM_START. We continue as soon as the debugger sends ResumeAll. Design doc: go/waitingfordebugger Test: Manually tested against Android Studio and jdb Bug: 261096302 Change-Id: I8850668fe306b14ba9979d1baa00b5be1d2cb60e
2022-12-02Fix broken headers am: 19ecab6e21Fabien Sanglard
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2322364 Change-Id: Ia8b50a2755d6cb293b4b1847b7aaa1937acaf924 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Add JDWP metrics to DDM trafficFabien Sanglard
Record processing start and duration for each cmd. Flush the content of the timing buffer when it is full. At the end of the session, (identified by VM::Exit cmd), also flush. The timing data is sent over a DDM packet with all the metrics recorded to allow debugger performance profiling. Test: NA Bug: NA Change-Id: If988dc25a8f7e552f1b049dbed8a953e47a7c6d0
2022-12-01Fix broken headersFabien Sanglard
Some headers are missing dependencies. Fix to oj-libjdwp is being submitted independently via appropriate channel. Test: NA Bug: NA Change-Id: I9f5187cf8cf03854183fa9bc62be13b179b65b89
2022-10-26Fix errorprone warnings that should be errors am: 3805153287Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2255383 Change-Id: I522d5a20b7ac91f765893abaf5ee635ac0ceee02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: Ie7c6aa45b47293179cde9eac8d45bbf7ab8aae0b
2022-09-22Clarify licensing wrt. recent policy change. am: 9b88cbd1bf am: 7b8749023d ↵Bob Badour
am: 9deef1b3d1 am: 730bfc804f Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2221394 Change-Id: Ic06c4de8faab0876777f15fc11981afb2055129b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Clarify licensing wrt. recent policy change. am: 9b88cbd1bf am: 7b8749023d ↵Bob Badour
am: 9deef1b3d1 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2221394 Change-Id: I73d50989934ee9df5d45a54654317f8c67bd61c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Clarify licensing wrt. recent policy change. am: 9b88cbd1bf am: 7b8749023dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2221394 Change-Id: I9afb448b4665a688cc103dee3f29f6c619fec836 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Clarify licensing wrt. recent policy change. am: 9b88cbd1bfBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2221394 Change-Id: Ia08b9632feb0b24eff6edc15c985ddbcd29cd4b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Clarify licensing wrt. recent policy change.android-t-qpr1-beta-2-gplBob Badour
Bug: 210546823 Test: m droid dist Change-Id: I3162eee79f82b9e89fe6210e618c9058f752cfeb
2022-07-15Remove redundant notice property. am: d82b64157c am: a42acb5a1c am: ↵Bob Badour
7da5a65464 am: 729f376b26 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2154234 Change-Id: I0df0802535a951b45f9dd1d99bc3e02e175590ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Remove redundant notice property. am: d82b64157c am: a42acb5a1c am: 7da5a65464Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2154234 Change-Id: I77cd15206ea9354f5c892685c1361a7bb7cfbb54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Remove redundant notice property. am: d82b64157c am: a42acb5a1cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2154234 Change-Id: I56af33c066cf729007afd153cdcb0ede3607df9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Remove redundant notice property. am: d82b64157cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2154234 Change-Id: I77b4ea72f4c023559a9fe01bacc038ae9ed4926a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14Remove redundant notice property.Bob Badour
Bug: 192434786 Test: m droid dist Change-Id: I67d4a6495b4179a4ae145c7669d094d702830262
2022-02-03Use standards compliant header locations am: 76492bc4ba am: bca9061010 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-wear-13.0.0-gpl_r3android-wear-13.0.0-gpl_r2android-wear-13.0.0-gpl_r1android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-t-qpr1-beta-3-gplandroid-t-qpr1-beta-1-gplandroid-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-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Colin Cross
d528dc0a0e am: ee7766102f Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969370 Change-Id: I383d4d4b8f235b0ae92706aab1766388a4448da9
2022-02-03Update OWNERS to point to art/OWNERS am: 1a84db956d am: 10fce84117 am: ↵Colin Cross
8612f0ab3d am: aaea20b916 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969371 Change-Id: I55955612d6974cc971c660bc995edaa3f3b55bf7
2022-02-03Use standards compliant header locations am: 76492bc4ba am: bca9061010 am: ↵Colin Cross
d528dc0a0e Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969370 Change-Id: I2cb5c568f142faaf5ae2bbdb84cfbb52ddaf9d14
2022-02-03Update OWNERS to point to art/OWNERS am: 1a84db956d am: 10fce84117 am: ↵Colin Cross
8612f0ab3d Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969371 Change-Id: I1bed82c7b9ee34ff7758640df96d904b817d8b64
2022-02-03Use standards compliant header locations am: 76492bc4ba am: bca9061010Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969370 Change-Id: Ice142b7705091c226d9297152687a744defd45b9
2022-02-03Update OWNERS to point to art/OWNERS am: 1a84db956d am: 10fce84117Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969371 Change-Id: I192ba2ee71db6d6e2aa9ae96dcf944990985ab2f
2022-02-03Use standards compliant header locations am: 76492bc4baColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969370 Change-Id: I0c8247292e48d055e894b44a92c52c8d142bf706
2022-02-03Update OWNERS to point to art/OWNERS am: 1a84db956dColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969371 Change-Id: I9322b1639c8c84993bf9c0816d6215d73ed790f3
2022-02-02Use standards compliant header locationsandroid-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Colin Cross
Use signal.h instead of sys/signal.h and poll.h instead of sys/poll.h to fix building against musl libc. Bug: 190084016 Test: m USE_HOST_MUSL=true host-native Change-Id: I41945f1b9414ceea7390f3eb5fbbac464f57c14e
2022-02-02Update OWNERS to point to art/OWNERSColin Cross
Test: none Change-Id: I80aa559f56644dc52c8e464c14e8dfde39c10ab2
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I6a191ca9abd060d4b9954ca9db52cc8da33d1b72
2021-03-04Merge "Add min_sdk_version for ART module." am: d0104a9bc8 am: 62a2e7e63e ↵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-releaseNicolas Geoffray
am: 402551e552 am: e09c835894 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1614486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5dddc8ea8101b05d7078169387da8a1c782a96a5
2021-03-04Merge "Add min_sdk_version for ART module." am: d0104a9bc8 am: 62a2e7e63e ↵Nicolas Geoffray
am: 402551e552 am: e09c835894 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1614486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I240ca64175294ade940ddae1d21a0471036e8097
2021-03-04Merge "Add min_sdk_version for ART module." am: d0104a9bc8 am: 62a2e7e63e ↵android-s-v2-preview-1android-s-qpr3-beta-1android-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-releaseandroid-s-v2-preview-1android-s-qpr3-beta-1Nicolas Geoffray
am: 402551e552 Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1614486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4735e3db9a9f7eb2c5e46b4e36716297b13a897b
2021-03-04Merge "Add min_sdk_version for ART module." am: d0104a9bc8 am: 62a2e7e63eNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1614486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c2a017e1f1fd3137d3214333af43cb923311d45
2021-03-04Merge "Add min_sdk_version for ART module." am: d0104a9bc8android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1614486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I214a4c58f3d2ae41e5c1ecc9f2fe77c7272da667
2021-03-04Merge "Add min_sdk_version for ART module."android-s-beta-2android-s-beta-1Nicolas Geoffray
2021-03-03Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: I99ed36b0a0a600f19ef83e5f2a788171b117faf0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f8093089e2 -s ↵Xin Li
ours am: 9a8b9ffe32 -s ours am: 4c6cbe2e83 -s ours am skip reason: Change-Id I54b9a5799a17e36a048992a000b414170ffa989b with SHA-1 486f126e42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifcef09ea8f43bf80f92e19bac84bc050cb59573f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f8093089e2 -s ↵Xin Li
ours am: 9a8b9ffe32 -s ours am: 4c6cbe2e83 -s ours am skip reason: Change-Id I54b9a5799a17e36a048992a000b414170ffa989b with SHA-1 486f126e42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I147c682fb9d9c83d0d6dd1a82af5cf042570ed60
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f8093089e2 -s ↵Xin Li
ours am: 9a8b9ffe32 -s ours am skip reason: Change-Id I54b9a5799a17e36a048992a000b414170ffa989b with SHA-1 486f126e42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a0b7361fb9a9c261fcd2417001b07f054f5192a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f8093089e2 -s oursXin Li
am skip reason: Change-Id I54b9a5799a17e36a048992a000b414170ffa989b with SHA-1 486f126e42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I584f698f94eb41cb13d38dbb51c22bb96a614e5c
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I54b9a5799a17e36a048992a000b414170ffa989b Change-Id: I508efac5f8533111fedc9a32ba4870ed5126034c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwp am: ddcab59e06 am: ↵Bob Badour
0d3a0bfc5b am: 838e4244de am: a8c9479baa Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1588923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d5ec4c19a82f003f3f0fc5d1b8e1f176fff3664
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwp am: ddcab59e06 am: ↵Bob Badour
0d3a0bfc5b am: 838e4244de am: a8c9479baa Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1588923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib387be67929c4efc641551a768a9dca4baac2a4f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwp am: ddcab59e06 am: ↵Bob Badour
0d3a0bfc5b am: 838e4244de Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1588923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3368d3ea8c9214ec21708d56edca013afb0ba235
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwp am: ddcab59e06 am: ↵Bob Badour
0d3a0bfc5b Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1588923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a75c752ae1ff156bdfb65bc1b0ff971524ae517
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwp am: ddcab59e06Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1588923 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1060d790abb66f73885d7fc9473ac0fb2f415deb
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/oj-libjdwpBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-with-classpath-exception SPDX-license-identifier-LGPL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I03fba4a452cb91d33d755f85ddd1a25a9acde3ad
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 17:24:57 +0000