aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android 12"HEADmasterXin Li2021-10-079-14/+84
|\
| * Merge Android 12Xin Li2021-10-069-14/+84
| |\
| | * Merge "Refactor various options into a struct" am: e7dae5af1eTreehugger Robot2021-10-064-31/+49
| | |\ | | |/ | |/|
| | * Update documentation following refactor am: 5cb6d9175bAnton Hansson2021-10-062-5/+0
| | |\
| | * \ Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-149-14/+84
| | |\ \
| | | * \ Introduce MTS controller for CtsClasspathsTestCases. am: 4aa5c83b69 am: bf08f...satayev2021-08-111-0/+8
| | | |\ \
| | | * \ \ Merge "Write generated data to a temp file first, attempt #2." into sc-dev am...TreeHugger Robot2021-08-062-4/+21
| | | |\ \ \
| | | | * \ \ Merge "Write generated data to a temp file first, attempt #2." into sc-devandroid12-devTreeHugger Robot2021-08-062-4/+21
| | | | |\ \ \
| | | | | * | | Write generated data to a temp file first, attempt #2.satayev2021-08-052-4/+21
| | | * | | | | Merge "Version bump for SdkExtensions" into sc-dev am: 98a26ccd9eAnton Hansson2021-08-061-1/+1
| | | |\| | | |
| | | | * | | | Merge "Version bump for SdkExtensions" into sc-devAnton Hansson2021-08-061-1/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Version bump for SdkExtensionsAnton Hansson2021-08-051-1/+1
| | | * | | | | Revert "Write generated data to a temp file first." am: 039aeea505Martijn Coenen2021-08-052-17/+7
| | | |\| | | |
| | | | * | | | Revert "Write generated data to a temp file first."Martijn Coenen2021-08-052-17/+7
| | | | |/ / /
| | | * | | | Write generated data to a temp file first. am: 895859550asatayev2021-08-042-7/+17
| | | |\| | |
| | | | * | | Write generated data to a temp file first.satayev2021-08-032-7/+17
| | | * | | | Add reserved_disk group in derive_classpath.rc. am: e5834114cbsatayev2021-08-031-1/+1
| | | |\| | |
| | | | * | | Add reserved_disk group in derive_classpath.rc.satayev2021-08-021-1/+1
| | | * | | | Fix S-Extension version assert am: db7f50bf14Anton Hansson2021-07-051-2/+3
| | | |\| | |
| | | | * | | Fix S-Extension version assertAnton Hansson2021-07-031-2/+3
| | | * | | | [automerger skipped] Add LOG statements to derive_classpath. am: acb41b96b6 a...satayev2021-07-020-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Add LOG statements to derive_classpath. am: 37f499ed98satayev2021-07-012-3/+12
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Add LOG statements to derive_classpath.satayev2021-07-012-3/+12
| | | * | | | | [automerger skipped] Merge "Check that DEX2OATBOOTCLASSPATH is a subset of BC...Treehugger Robot2021-06-180-0/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge "Update OWNERS for derive_classpath stuff." am: 0ee9ea9c9c am: f319b045a4satayev2021-06-183-0/+6
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Check that DEX2OATBOOTCLASSPATH is a subset of BCP. am: ba006cf8c5satayev2021-06-181-0/+4
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Check that DEX2OATBOOTCLASSPATH is a subset of BCP.satayev2021-06-181-0/+4
| | | * | | | | | | Merge "Use DeviceSdkLevel.isAtLeastS() in ClasspathsTest." am: 2ebdcd70e9 am:...Treehugger Robot2021-06-172-7/+4
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ [automerger skipped] Add conscrypt module to the set of R modules am: 6732eeb...Anton Hansson2021-06-170-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Ignore core-icu4j in ClasspathsTest. am: b3d8ea07a7satayev2021-06-161-2/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Ignore core-icu4j in ClasspathsTest.satayev2021-06-161-2/+5
| | | * | | | | | | | | [automerger skipped] Explicitly CHECK that derive_classpath is run on S+ only...satayev2021-06-140-0/+0
| | | |\| | | | | | | |
| | | | * | | | | | | | Explicitly CHECK that derive_classpath is run on S+ only.satayev2021-06-141-8/+12
| | | * | | | | | | | | Explicitly CHECK that derive_classpath is run on S+ only. am: a10318beeb am: ...satayev2021-06-141-8/+12
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Define SdkExtension version 1" into sc-dev am: 81d6c4f82cAnton Hansson2021-06-104-8/+73
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Define SdkExtension version 1" into sc-devAnton Hansson2021-06-104-8/+73
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Define SdkExtension version 1Anton Hansson2021-06-104-8/+73
| | | * | | | | | | | | | | [automerger skipped] Merge "Make test_framework-sdkextensions a separate jar ...TreeHugger Robot2021-06-100-0/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Make test_framework-sdkextensions a separate jar with test classes." i...TreeHugger Robot2021-06-104-32/+23
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Make test_framework-sdkextensions a separate jar with test classes.satayev2021-06-084-32/+23
| | | * | | | | | | | | | | Add conscrypt module to the set of R modules am: d79bbdd2eeAnton Hansson2021-06-081-4/+3
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Add conscrypt module to the set of R modulesAnton Hansson2021-06-081-4/+3
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | Merge "Make test_framework-sdkextensions a separate jar with test classes." a...satayev2021-06-084-32/+23
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ [automerger skipped] Change E2E "default" version check am: 8bc9c0a579 am: db...Anton Hansson2021-06-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Merge commit 'fb75e1df38515bc6f4ba0a3b048765b11fd05770' into sc-dev-pl...Artur Satayev2021-06-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'fb75e1df38515bc6f4ba0a3b048765b11fd05770' into sc-dev-plus-aospsatayev2021-06-0411-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ Move sdkextensions_e2e_tests to tests/e2e/Extensions/. am: 4e92e6a84csatayev2021-06-0411-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Move sdkextensions_e2e_tests to tests/e2e/Extensions/.satayev2021-06-0411-1/+1
| | | * | | | | | | | | | | | | [automerger skipped] Merge "Revert "Revert "Move sdkextensions_e2e_tests to g...TreeHugger Robot2021-06-030-0/+0
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Revert "Revert "Move sdkextensions_e2e_tests to group presubmit-large"...TreeHugger Robot2021-06-031-1/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \