aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-28Snap for 8512216 from b0dbd53706069619146ce04c7fc34ab08936334d to ↵t_frc_adb_330444000android13-frc-adbd-releaseAndroid Build Coastguard Worker
tm-frc-adbd-release Change-Id: I3ab1ce44029b6673aa9cc248317831ddd960b53b
2022-03-14Tweak linux_glibc properties for musl builds in external/jemalloc_new am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseColin Cross
6922f4491d am: b3d247b675 am: 9bf8eb3e0e Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/2019081 Change-Id: If3f738a33b5798fb515a6bfb3da25a3cf9cfa54a
2022-03-14Tweak linux_glibc properties for musl builds in external/jemalloc_new am: ↵Colin Cross
6922f4491d am: b3d247b675 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/2019081 Change-Id: I8ad4999a39d1adf61b752c392a7114fb666f5584
2022-03-14Tweak linux_glibc properties for musl builds in external/jemalloc_new am: ↵Colin Cross
6922f4491d Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/2019081 Change-Id: I3462fdb6ba8da270a2d387f54135f791abf6f3c3
2022-03-08Tweak linux_glibc properties for musl builds in external/jemalloc_newColin Cross
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ia3fd92d2f3494d64a7565d8016ff9aa09574e086
2022-01-05Disable je_* renaming for integration tests am: 6412c82128 am: 151e191e01 ↵Colin Cross
am: d5360715e0 am: 6328b3cf84 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1931392 Change-Id: I5816f376c6e245cbed03c442fbc4570a52903af0
2022-01-05Disable je_* renaming for integration tests am: 6412c82128 am: 151e191e01 ↵Colin Cross
am: d5360715e0 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1931392 Change-Id: Ia01aa96ae238078d8462330f077cfcc20fe09a64
2022-01-05Disable je_* renaming for integration tests am: 6412c82128 am: 151e191e01Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1931392 Change-Id: If25814cf37c195ec79b5557333aea213c365d88c
2022-01-05Disable je_* renaming for integration tests am: 6412c82128Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1931392 Change-Id: I4d83de70f07bac67a6b3c2b78f6cd74741232773
2021-12-21Disable je_* renaming for integration testsandroid-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-1Colin Cross
The integration tests fail to build with musl because the je_* declarations use __attribute__(nothrow), which doesn't match the declarations in musl. When the je_* declarations are renamed to remove the je_ suffix, they collide with the musl declarations and fail with: external/jemalloc_new/include/jemalloc/jemalloc.h:197:28: error: exception specification in declaration does not match previous declaration void JEMALLOC_NOTHROW *je_malloc(size_t size) ^ external/jemalloc_new/include/jemalloc/jemalloc_rename.h:38:21: note: expanded from macro 'je_malloc' ^ external/musl/include/stdlib.h:42:7: note: previous declaration is here void *malloc (size_t); ^ Set JEMALLOC_NO_RENAME for the integration tests so they use the je_* names. This will also avoid the tests accidentally calling the libc methods. Bug: 190084016 Test: m USE_HOST_MUSL=true jemalloc_integrationtests_basic Test: out/host/linux-x86/nativetest/jemalloc5_integrationtests/basic Change-Id: Iddc7e0f9ecb688487484ed413ad8c81ce548cc5f
2021-07-28Support compiling libjemalloc5 against musl am: 7326a7c470 am: 727713db35 ↵Colin Cross
am: ff4e3653d8 am: bf5247daad Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1776846 Change-Id: I91f173ec07e138be8fd1357eda47c81fa2434b94
2021-07-28Support compiling libjemalloc5 against musl am: 7326a7c470 am: 727713db35 ↵Colin Cross
am: ff4e3653d8 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1776846 Change-Id: I8d68a01b2f70349618ec199681140e2160ddacd6
2021-07-28Support compiling libjemalloc5 against musl am: 7326a7c470 am: 727713db35android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1776846 Change-Id: I2d551e55038906c2005fb5596e7b70fc9997dd78
2021-07-28Support compiling libjemalloc5 against musl am: 7326a7c470Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1776846 Change-Id: I2697e627273c1073073cce8634bb13ca7c3195fd
2021-07-23Support compiling libjemalloc5 against muslandroid-s-beta-5android-s-beta-5Colin Cross
Musl in the Android platform is configured to use libjemalloc5 by default as the built-in malloc causes a segfault when running aprotoc. Fix a build error that assumes pthread_t is an unsigned long when initializing it to zero. Adjust the host configuration to work with musl. Bug: 190084016 Test: m out/soong/host/linux-x86/bin/aprotoc && out/soong/host/linux-x86/bin/aprotoc Change-Id: I5b5d5226744817b8705d58f6b71cf6c62b128eee
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I1081331ecd104285375a459c3d6dbcce0df1a170
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8b28ac89b2 -s ↵Xin Li
ours am: 13cbf156c1 -s ours am: 517ee63ccd -s ours am skip reason: Change-Id I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd with SHA-1 ad8f39c73d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib25600b65507ea277f7c894ed22920f2f986088a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8b28ac89b2 -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: 13cbf156c1 -s ours am: 517ee63ccd -s ours am skip reason: Change-Id I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd with SHA-1 ad8f39c73d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d78e1732b1f4858ce8a4645e9ac2d82f082ad30
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8b28ac89b2 -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: 13cbf156c1 -s ours am skip reason: Change-Id I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd with SHA-1 ad8f39c73d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibdea17b1d4a38a96fc0b93d5f06d9415044567d6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8b28ac89b2 -s oursXin Li
am skip reason: Change-Id I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd with SHA-1 ad8f39c73d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3feb1543663d3ed32237c0c58e686859fb637397
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd Change-Id: I1ee202ad4406a0a858d84f13ea5a705ec61f85a0
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_new am: 33d62c57c1 am: ↵Bob Badour
0c24e096eb am: 289a9908c1 am: 272ba2c4ea Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1588856 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4d18c56800efe82e6f79187a4ca97638f22bfe1b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_new am: 33d62c57c1 am: ↵Bob Badour
0c24e096eb am: 289a9908c1 am: 272ba2c4ea Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1588856 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75c591f150a116a78270376650af7cc7546a9831
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_new am: 33d62c57c1 am: ↵Bob Badour
0c24e096eb am: 289a9908c1 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1588856 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ff4c068610d84777a9864ffbca957de609f1793
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_new am: 33d62c57c1 am: ↵Bob Badour
0c24e096eb Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1588856 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie8b2b72402f9fca570ae02ad3b84255a62109a5f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_new am: 33d62c57c1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1588856 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I827c76af4ef8193734dc346a21435337532fa4c7
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jemalloc_newandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-ISC SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I08e4267e770abd308d9e044299821520098b10c2
2020-11-24Mark ab/6881855 as merged am: d21b7bb14a am: ad8f39c73dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jemalloc_new/+/13110682 Change-Id: I78809f036f29f27c78e7719bf4661db7c414b63c
2020-11-24Mark ab/6881855 as merged am: d21b7bb14aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jemalloc_new/+/13110682 Change-Id: I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I52e6714ed88a5be4c960eb9de4ce8e4d5f47457e
2020-10-29Merge "Make vendor_ramdisk_available." am: 4a13357c76 am: 8565f18203 am: ↵Yifan Hong
19b86d9b44 am: 6e6a931704 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1469669 Change-Id: Ia5b5209fe7fae90eb635d7c14b3b490b7519b96a
2020-10-29Merge "Make vendor_ramdisk_available." am: 4a13357c76 am: 8565f18203 am: ↵Yifan Hong
19b86d9b44 Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1469669 Change-Id: I78bf5c9dbee63e7c532ee99ca4ea826af50c22dc
2020-10-29Merge "Make vendor_ramdisk_available." am: 4a13357c76 am: 8565f18203Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1469669 Change-Id: I86abfa1f728a6dc34e8826bd3791e7ca26309e92
2020-10-29Merge "Make vendor_ramdisk_available." am: 4a13357c76Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/1469669 Change-Id: Ib348876d7e534e154ecfc5d476a40335d9791486
2020-10-29Merge "Make vendor_ramdisk_available."Yifan Hong
2020-10-21Make vendor_ramdisk_available.Yifan Hong
Test: pass Bug: 156098440 Change-Id: Id07005539db17929f21cb7bb3e134d960e056db6
2020-05-06Bionic and kernel system include paths are no longer implicit. am: ↵Martin Stjernholm
838a8c58b2 am: b32ec89beb am: 69c835d562 am: 8d41b14439 am: 48b2f6625e Change-Id: I14d7bbdb38e436f55946a7d7abe9f09b93fbd5dc
2020-05-06Bionic and kernel system include paths are no longer implicit. am: ↵Martin Stjernholm
838a8c58b2 am: b32ec89beb am: 69c835d562 am: 8d41b14439 Change-Id: Ie5e3f0c1bb25c3ab11aa9e8f3fec028dc2e05340
2020-05-06Bionic and kernel system include paths are no longer implicit. am: ↵Martin Stjernholm
838a8c58b2 am: b32ec89beb am: 69c835d562 Change-Id: I6bf13cde8eaa51a175ee1610f072b57bc72e91f2
2020-05-06Bionic and kernel system include paths are no longer implicit. am: ↵Martin Stjernholm
838a8c58b2 am: b32ec89beb Change-Id: I5e1f3313ca9f0df3ce700cefedade8ea1a2ddb84
2020-05-06Bionic and kernel system include paths are no longer implicit. am: 838a8c58b2android-r-beta-3android-r-beta-2Martin Stjernholm
Change-Id: Ibdef1e42039d35f028f08fc03e206cb91354a209
2020-04-30Bionic and kernel system include paths are no longer implicit.Martin Stjernholm
Test: Build and boot Bug: 153590472 Change-Id: Icd07ff407d3ddcbcfb2f3bb817e92f2c6d7b44d8
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICE am: 5b79d5eb49 am: ↵Bob Badour
e1ae8c6d19 am: 2c69f2c796 am: 79aac14c11 am: 10b196c21e Change-Id: I634f7d6227689a292ab372a43b75034e8337dbd2
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICE am: 5b79d5eb49 am: ↵Bob Badour
e1ae8c6d19 am: 2c69f2c796 am: 79aac14c11 Change-Id: If6d308b2e8c9f0cb9a9397404b07162e8f3e7343
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICE am: 5b79d5eb49 am: ↵Bob Badour
e1ae8c6d19 am: 2c69f2c796 Change-Id: I8cac7cf0b0891e50fc366482a84c6f497f1ee0b3
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICE am: 5b79d5eb49 am: ↵Bob Badour
e1ae8c6d19 Change-Id: If548684ca17535d740370a89869806165656eac0
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICE am: 5b79d5eb49Bob Badour
Change-Id: I8de9c368fa9941f2ceff1946efc9ec9fef82ebb8
2020-04-28Add METADATA to jemalloc_new: BSD+Apache2+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I9f5e1dab4a638615a9934eb4f6cd09764d767674
2020-04-21[automerger skipped] Only retain for 64 bit. am: d3a7616aa2 am: ae06453fb8 ↵Christopher Ferris
am: 45117afe65 am: 21acbb987d -s ours am: 863cc44626 -s ours am skip reason: Change-Id Iaec8276582f880145a1ca5ebbaa65789f46d2bf2 with SHA-1 d3a7616aa2 is in history Change-Id: I3e1f37723e8d551c6ce70a735039832644fda2d3
2020-04-21[automerger skipped] Only retain for 64 bit. am: d3a7616aa2 -s ours am: ↵Christopher Ferris
1e79f023e8 -s ours am: 002ab15677 -s ours am: 2413e29bc4 -s ours am skip reason: Change-Id Iaec8276582f880145a1ca5ebbaa65789f46d2bf2 with SHA-1 d3a7616aa2 is in history Change-Id: I2df4e5c6e8d5436d5d42cbb282c316561a6e2d07
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 07:57:33 +0000