aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-13[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev.android-vts-12.1_r2android-cts-12.1_r2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releasePete Bentley
2021-09-30Merge "[Cherry pick of aosp/1776170] Extra JNI null checks and error fixes." ...TreeHugger Robot
2021-09-29[Cherry Pick of aosp/1778966]Jonathan Scott
2021-09-29[Cherry pick of aosp/1776170]Jonathan Scott
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ...Xin Li
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ...android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseXin Li
2021-08-13[automerger skipped] Merge ab/7633965 am: e4dd2272f8 -s oursThe Android Open Source Project
2021-08-13Merge stage-aosp-sc-ts-dev before making it an upstreamXin Li
2021-08-12Merge ab/7633965The Android Open Source Project
2021-07-23Update development module version number to 319999900 am: 7c386bb4efAdam Seaton
2021-07-13Update development module version number to 319999900Adam Seaton
2021-07-02Replace ART's core-platform-api stub with module-lib stubs am: 30eded521eVictor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubsVictor Chang
2021-06-08Include sdk versioning proto in conscrypt apex am: 226bfdd77eAnton Hansson
2021-06-08Include sdk versioning proto in conscrypt apexAnton Hansson
2021-06-07Merge "Set dist_group: "android" for external/conscrypt java_sdk_libraries" i...TreeHugger Robot
2021-06-07Merge "Set dist_group: "android" for external/conscrypt java_sdk_libraries" i...TreeHugger Robot
2021-06-05Dist conscrypt's CorePlatformApi stubs am: dea8f0ba76Anton Hansson
2021-06-04Dist conscrypt's CorePlatformApi stubsAnton Hansson
2021-06-03Set dist_group: "android" for external/conscrypt java_sdk_librariesColin Cross
2021-05-26Enable hidden API processing for com.android.conscrypt-bootclasspath-fragment...Paul Duffin
2021-05-25Enable hidden API processing for com.android.conscrypt-bootclasspath-fragmentPaul Duffin
2021-05-24Replace @link with @code for public alternatives am: 41f0e2d6c0Paul Duffin
2021-05-23Replace @link with @code for public alternativesPaul Duffin
2021-05-20Merge "Make libconscrypt_openjdk_jni visible to vendor" into sc-dev am: 12fb6...Kwang-un Jin
2021-05-20Merge "Make libconscrypt_openjdk_jni visible to vendor" into sc-devKwang-un Jin
2021-05-14Add bootclasspath_fragment. am: 1081254f5e am: 21fa559e27 am: 58b3fac5aesatayev
2021-05-14Add bootclasspath_fragment. am: 1081254f5e am: 21fa559e27satayev
2021-05-14Make libconscrypt_openjdk_jni visible to vendorKwang-un Jin
2021-05-12Add bootclasspath_fragment. am: 1081254f5esatayev
2021-05-12Add bootclasspath_fragment.android-s-beta-2android-s-beta-1satayev
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41 am: 0ba742fea8Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56 am: 20c8844f41Pete Bentley
2021-05-07Merge Conscrypt upstream master. am: b51c989d56Pete Bentley
2021-05-07Merge Conscrypt upstream master.Pete Bentley
2021-05-07Remove unnecessary const_cast. (#1008)David Benjamin
2021-05-07Use i2d_X509_CRL_tbs to encode the TBSCertList. (#1007)David Benjamin
2021-05-04Merge "Make conscrypt test apex visible in vendor directory" into sc-devKun Niu
2021-04-30Make conscrypt test apex visible in vendor directory am: 8b779c1d66 am: acf3d...Kun Niu
2021-04-30Make conscrypt test apex visible in vendor directory am: 8b779c1d66 am: acf3d...Kun Niu
2021-04-30Make conscrypt test apex visible in vendor directory am: 8b779c1d66Kun Niu
2021-04-30Make conscrypt test apex visible in vendor directoryKun Niu
2021-04-30Make conscrypt test apex visible in vendor directoryKun Niu
2021-04-28Merge "Add MtsConscryptTestCases to mainline test mapping for Conscrypt." am:...Treehugger Robot
2021-04-28Merge "Add MtsConscryptTestCases to mainline test mapping for Conscrypt." am:...Treehugger Robot
2021-04-28Merge "Add MtsConscryptTestCases to mainline test mapping for Conscrypt." am:...Treehugger Robot
2021-04-28Merge "Add MtsConscryptTestCases to mainline test mapping for Conscrypt."Treehugger Robot
2021-04-26Add MtsConscryptTestCases to mainline test mapping for Conscrypt.easoncylee
2021-04-23Fix MacTest for BC on older Android platform builds. (#1006) am: 8cd8dd816a a...Pete Bentley
2021-04-23Fix MacTest for BC on older Android platform builds. (#1006) am: 8cd8dd816a a...Pete Bentley