aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | * | | | Merge "Regression test for scudo crash in resizeTaggedChunk." into ↵Treehugger Robot2022-04-270-0/+0
| | | | | |/| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: d8fa0f64af Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121 Change-Id: I49830085e20d8aa627b9322672aaaa4770ac5515 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | Merge "Regression test for scudo crash in resizeTaggedChunk." into ↵Treehugger Robot2021-11-301-0/+22
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev
| | | | | | | * | | Regression test for scudo crash in resizeTaggedChunk.Evgenii Stepanov2021-11-241-0/+22
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a copy of the upstream scudo test for CTS: https://reviews.llvm.org/rG913d78c40c37c9c3428285d868ce454b058e40f3 Bug: 206701345 Test: CtsBionicTestCases Change-Id: I76b6b33c0665d7ad3bdd8c07d39a39d0d24d94df (cherry picked from commit f0d7a34e257494c7a0248e399849bb714bb9fcc4)
| | | | | * | | | Merge "Merge "Skip the malloc_slack test on native bridge." into ↵Automerger Merge Worker2022-04-271-0/+2
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: 1623704319" into android12L-tests-dev
| | | | | | * | | | Merge "Skip the malloc_slack test on native bridge." into ↵Treehugger Robot2022-04-271-0/+2
| | | | | |/| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: 1623704319 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022 Change-Id: Id50dd0d3a8060ad7943a9f08401e88b05c75be4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | Merge "Skip the malloc_slack test on native bridge." into android12-tests-devTreehugger Robot2021-10-191-0/+2
| | | | | | |\ \ \
| | | | | | | * | | Skip the malloc_slack test on native bridge.Christopher Ferris2021-10-121-0/+2
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The allocator for the native bridge is not necessarily going to allocate the slack data. Bug: 202428612 Test: Ran on non-native bridge and verified test isn't skipped. Test: Ran on native bridge and verified test is skipped. Change-Id: Ia1555be0e9f55896af7ca81830605367133c44a1 (cherry picked from commit 7c0ce86a00433159dfc5dc7164feb752d094dff4)
| | | | | * | | | Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev
| | | | | | * | | | Merge "Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |/| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415 Change-Id: I8bbdff9b63ebf8e0ee708c6c56fdf020c9f96c13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | Merge "Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev
| | | | | | | * | | Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | |/| | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415 Change-Id: I31c9e8e1b4c039a0a9a0b5192997b2adc784ed42
| | | | | | | * | Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker2020-10-230-0/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 3144bf7b69" into android11-tests-dev
| | | | | | | | * | Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: ↵Treehugger Robot2020-10-230-0/+0
| | | | | | | |/| | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3144bf7b69 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415 Change-Id: Ie89af84c17f67c94225f134a0e04204cd1e57d22
| | | | | | | | * Merge "Fix possible issue with cfi_basic test." into android10-tests-devTreehugger Robot2020-10-101-4/+15
| | | | | | | | |\
| | | | | | | | | * Fix possible issue with cfi_basic test.pyung.lee2020-10-061-4/+15
| | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible for malloc to return a pointer that is not going to crash with __cfi_slowpath. It's possible to modify the cfi code to avoid this problem, but I'm not convinced that this will be any better at catching problems. So I'm just modifying the test so that it will eventually allocate a pointer that does not overlap. This previous version of the test failed on jemalloc svelte config, but there is nothing that would not result in a failure on scudo leading to a failure every once in a while. Bug: 142556796 Bug: 140079007 Test: cts -m CtsBionicTestCases Change-Id: Ibf12a286c411e0bdc9f81589f2f66fd0ccd7f07a (cherrypick of f322483b3f8a6e05db5c3fc7974601032a03ba0a)
| | | | | * | | | Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12L-tests-dev * changes: Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into android12-tests-dev am: 0f42ca9a3d [automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours
| | | | | | * | | | Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: 0f42ca9a3d Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: I962fc4b81e6ad9036be2aed88e6bc5cc58e69cad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | | * | | Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev * changes: Merge "[automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours" into android11-tests-dev am: eafafead8f [automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours
| | | | | | | | * | | Merge "[automerger skipped] Merge "Remove stack address check in cfi_basic ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test." into android10-tests-dev am: c9608ab2e2 -s ours" into android11-tests-dev am: eafafead8f Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: Ida10020d13a9e1e227b0d80dd7c779cff0614da5
| | | | | | | | | * | Merge "[automerger skipped] Merge "Remove stack address check in cfi_basic ↵Automerger Merge Worker2020-10-230-0/+0
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test." into android10-tests-dev am: c9608ab2e2 -s ours" into android11-tests-dev
| | | | | | * | | | | | [automerger skipped] Merge "Remove stack address check in cfi_basic test." ↵Treehugger Robot2022-04-270-0/+0
| | | | | |/| | | | | | | | | | | | | |/ / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours am skip reason: skipped by user eugenis Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: I936a873352937664f09b12a6f00c46de893fccf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | [automerger skipped] Merge "Remove stack address check in cfi_basic test." ↵Treehugger Robot2021-10-120-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | / / | | | | | | | | |/ / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am skip reason: skipped by user eugenis Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: Ifd086913e9f0379e02ded8f70fd49ce87b6ad22b
| | | | | | | * | | [automerger skipped] Merge "Remove stack address check in cfi_basic test." ↵Treehugger Robot2020-10-230-0/+0
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | |/| / | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into android10-tests-dev am: c9608ab2e2 -s ours am skip reason: skipped by user eugenis Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: I1d9eacd730944d1d88902c1181eb94e6214b2f87
| | | | | | | | * Merge "Remove stack address check in cfi_basic test." into android10-tests-devTreehugger Robot2020-07-291-3/+0
| | | | | | | | |\
| | | | | | | | | * Remove stack address check in cfi_basic test.Evgenii Stepanov2020-07-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not actually a property that is guaranteed by the bionic implementation of CFI shadow. Since the gaps between libraries are not completely inaccessible, it is possible for a stack mapping to sneak in, which would cause the callback to register in the test library. This is not a correctness issue in CFI as the actual __cfi_check callback will reject such address anyway, at a small CPU cost. Bug: 156218352 Test: CtsBionicTestCases-cfi_test#basic Change-Id: I8d04fb7132e1eac2a8abfbc48a37c8eac6e25a09 (cherry picked from commit 0f6b504e0c682e7c3d377416dacfe57b6c59f1b8)
| | | | | * | | | | Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12L-tests-dev * changes: Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into android12-tests-dev am: 80effeeac9 [automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours
| | | | | | * | | | | Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: 80effeeac9 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: Iff415cc90425d8727609998829f782fbc143a0bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | | * | | | Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev * changes: Merge "[automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours" into android11-tests-dev am: 8734e197cd [automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours
| | | | | | | | * | | | Merge "[automerger skipped] Merge "Fix linker path for emulated ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architecture" into android10-tests-dev am: ce45ee1184 -s ours" into android11-tests-dev am: 8734e197cd Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: I0a7b287a0cbad51aa9b5e516fe6517afd7aa1ceb
| | | | | | | | | * | | Merge "[automerger skipped] Merge "Fix linker path for emulated ↵Automerger Merge Worker2020-10-230-0/+0
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architecture" into android10-tests-dev am: ce45ee1184 -s ours" into android11-tests-dev
| | | | | | * | | | | | | [automerger skipped] Merge "Fix linker path for emulated architecture" into ↵Treehugger Robot2022-04-270-0/+0
| | | | | |/| | | | | | | | | | | | | | |/ / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am skip reason: skipped by user levarum Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: I4b1309e041e0ec2399d8c61777c04183b1e998f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | | [automerger skipped] Merge "Fix linker path for emulated architecture" into ↵Treehugger Robot2021-10-120-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | / / / | | | | | | | | |/ / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am skip reason: skipped by user levarum Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: I29275291b75decd4053613fcd4eea0097c843667
| | | | | | | * | | | [automerger skipped] Merge "Fix linker path for emulated architecture" into ↵Treehugger Robot2020-10-230-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| / / | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: ce45ee1184 -s ours am skip reason: skipped by user levarum Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: I6eca03a9723fc6b6718d91ebe1b5e336c3f899ae
| | | | | | | | * | Merge "Fix linker path for emulated architecture" into android10-tests-devTreehugger Robot2020-01-091-9/+42
| | | | | | | | |\ \
| | | | | | | | | * | Fix linker path for emulated architectureDmytro Chystiakov2019-12-061-9/+42
| | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dl#exec_linker* tests are failing on devices with emulated architecture due to hardcoded path to linker. Test: bionic-unit-tests --gtest_filter=dl.exec_linker* Bug: b/141914915 Change-Id: Id6d8d3ee7114e70b07e44034aa62dce0a3e0760e Signed-off-by: Dmytro Chystiakov <dmytro.chystiakov@intel.com> (cherry picked from commit 595c38184120e286670aa1ae60b6ae35c62147b7)
| | | | | * | | | | Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12L-tests-dev * changes: Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into android12-tests-dev am: e30b026c00 [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours
| | | | | | * | | | | Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev am: e30b026c00 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: I78e626ce0389a9b719f1432a035e0f05359ace5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | | * | | | Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android12-tests-dev * changes: Merge "[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours" into android11-tests-dev am: 98b842fce6 [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours
| | | | | | | | * | | | Merge "[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours" into android11-tests-dev am: 98b842fce6 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: I0be678a9298669f934a0a8fb95ba57944c8228a1
| | | | | | | | | * | | Merge "[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case ↵Automerger Merge Worker2020-10-230-0/+0
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours" into android11-tests-dev
| | | | | | * | | | | | | [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit ↵Treehugger Robot2022-04-270-0/+0
| | | | | |/| | | | | | | | | | | | | | |/ / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am skip reason: skipped by user rossyeh Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: Iefbfb2034a76c1857fa205cc7d53230cacba75aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | | [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit ↵Treehugger Robot2021-10-120-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | / / / | | | | | | | | |/ / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am skip reason: skipped by user rossyeh Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: Ica7b2ac60a2853ac7d2539c1a7c377d7faab59cb
| | | | | | | * | | | [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit ↵Treehugger Robot2020-10-230-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| / / | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary translations" into android10-tests-dev am: 3382f346fc -s ours am skip reason: skipped by user rossyeh Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: Iab08e02254da66d35ce81c4b694b93ec6f49323d
| | | | | | | | * | Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" ↵Treehugger Robot2019-12-121-3/+3
| | | | | | | | |\ \ | | | | | | | | | |/ | | | | | | | | |/| | | | | | | | | | | into android10-tests-dev
| | | | | | | | | * Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translationsDmytro Chystiakov2019-12-051-3/+3
| | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64bit libraries should be located in /system/lib64 directory instead of /system/lib for platforms with emulated arhitecture. This patch updated ALTERNATE_PATH_TO_SYSTEM_LIB for 64bit values Test: run cts -m CtsBionicTestCases -t dlfcn.dladdr_libc Bug: 129389761 Change-Id: I29d6d36d15d7e61818c7ed1cfd0786745d9ae6a2 Signed-off-by: Dmytro Chystiakov <dmytro.chystiakov@intel.com> (cherry picked from commit e712cd185f34dd154b4672abae76eae262a03c65)
| | | | | * | | | Merge "Merge "Merge "Merge "Stop executing if skip occurs." into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev
| | | | | | * | | | Merge "Merge "Merge "Stop executing if skip occurs." into ↵Automerger Merge Worker2022-04-270-0/+0
| | | | | |/| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826 Change-Id: Ie9e151f8485c6fe17422edf3177bacf2c994f26e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | Merge "Merge "Merge "Stop executing if skip occurs." into ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev
| | | | | | | * | | Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: ↵Automerger Merge Worker2021-10-120-0/+0
| | | | | | |/| | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e4793561f" into android11-tests-dev am: 3596058918 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826 Change-Id: Iaa317d4e411e56e838ff8a71b77dd68efcf094a4
| | | | | | | * | Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: ↵Automerger Merge Worker2020-10-200-0/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e4793561f" into android11-tests-dev