summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-11Snap for 11201560 from c94f6bdc18810d9e185a6d5258e515aacc235af9 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: If81bac0f3422525654adb2fe378f3521678f371e
2023-12-10Merge "Fix static_sdk_tools by using static libicuuc" into main am: ↵Colin Cross
3fcf9070e9 am: cc56d0869e am: ffa707bcfd Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2866535 Change-Id: Ief88758276aea37c915c3982f27f7fb57ec270f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-10Merge "Fix static_sdk_tools by using static libicuuc" into main am: ↵Colin Cross
3fcf9070e9 am: cc56d0869e Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2866535 Change-Id: Iedc803f81f244105071fbdf7a075c15c59176619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-10Merge "Fix static_sdk_tools by using static libicuuc" into main am: 3fcf9070e9Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2866535 Change-Id: I9c1fe6f3e0a5e23a6f984102297341dc84b388f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-10Merge "Fix static_sdk_tools by using static libicuuc" into mainColin Cross
2023-12-09Snap for 11200327 from 15fcd4498f727249727e416359d178c8d284a072 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I4d015cee7d36775d15e1dd49ec29da99ceb145d5
2023-12-09Fix static_sdk_tools by using static libicuucColin Cross
The static_sdk_tools build builds sqlite3 with BUILD_HOST_static=1, which forces it to be linked as a static executable. Switch the host build to make libicuuc and its transitive dependencies static so that the static binary can link without missing symbols errors. Test: m static_sdk_tools TARGET_RELEASE=trunk dist BUILD_HOST_static=1 Change-Id: I9d4e910cd34094d4297119f5eba215b30cc52b11
2023-12-08Merge "Revert "Delete Apache license from the sqlite build script"" into ↵Lee Shombert
main am: 586e52fd87 am: 5cecb15d89 am: cf447c36c9 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863528 Change-Id: Ifd2cc06a84fb157789ad95f9d51a1469b61776e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Revert "Delete Apache license from the sqlite build script"" into ↵Lee Shombert
main am: 586e52fd87 am: 5cecb15d89 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863528 Change-Id: Id47f94ef86b2cf1c181f12975b4201ade50189cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Revert "Delete Apache license from the sqlite build script"" into ↵Lee Shombert
main am: 586e52fd87 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863528 Change-Id: Ie4f5c1c26abacc13d94b8f8fedad16ef96424b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Revert "Delete Apache license from the sqlite build script"" into mainLee Shombert
2023-12-08Revert "Delete Apache license from the sqlite build script"Lee Shombert
This reverts commit 4a2e6bb8c336c8d9f43ef3bd20fe36b16d5d81c9. Reason for revert: This revert appears to be unnecessary. The presubmit that raised an issue with the license passed on retry. Also, since every other file in the package contains the same license, this file should have a license, too. Change-Id: Ia40c9eb408b4c86bbf254ec01434534eaffb3e9e
2023-12-08[automerger skipped] Upgrade SQLite to version 3.42.0 am: ac382d282a -s ours ↵Lee Shombert
am: 118819e2c5 -s ours am skip reason: Merged-In I99ab5d3bef6e5aab2043400cade818b0789b8f44 with SHA-1 1550510372 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/25372729 Change-Id: Ie8edd653c86151b11d1a23cb39683fb6c8578f8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] Upgrade SQLite to version 3.42.0 am: ac382d282a -s oursLee Shombert
am skip reason: Merged-In I99ab5d3bef6e5aab2043400cade818b0789b8f44 with SHA-1 1550510372 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/25372729 Change-Id: I3e2297121d1502db880df88faa799c02862c5747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Snap for 11192287 from fba36aca3f715d498775f76a7b900c300afada45 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Id60d8f188c50d1be1bace39f1fff84cc4aa72a93
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 am: 25818f3c5d am: 7d65b0dafe Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: Ifb0930e980606d646f2a3aaea6984f421ecc49d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 am: 25818f3c5d Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: I2c2d3a2997c989225725463e48a1fbdfa87240c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 am: 2a59bf22d9 am: 4fcbd9f6f2 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: I8197ac8abf36dce523170b19e0d1d2831f8a9c58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 am: 2a59bf22d9 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: I08159c67d7b3e6969bacca5100cde571b956fa9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: Ic19418924af23a191756acbd9a269690f267639e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Delete Apache license from the sqlite build script" into main am: ↵Lee Shombert
08326f7296 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2863710 Change-Id: I55bc749dd32d8469f5065f5e8cfeff9fcecfef33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Upgrade SQLite to version 3.42.0Lee Shombert
Bug: 285936283 Downloaded from https://sqlite.org/2023/sqlite-autoconf-3420000.tar.gz $ openssl dgst -sha3-256 sqlite-autoconf-3420000.tar.gz SHA3-256(sqlite-autoconf-3420000.tar.gz)= 643898e9fcc8f6069bcd47b0e6057221c1ed17bbee57da20d2752c79d91274e8 dist/orig contains the stock sqlite3 code, as packaged in the tar.gz file above. dist contains a copy of dist/orig, but with the Android.patch file applied. More details about the release are available here: https://www.sqlite.org/releaselog/ Test: code compiles and device boots with no problems. Test: select sqlite_version() - returns 3.42.0 Test: atest cts/SQLiteDatabaseTest all passed. Test: atest cts/SQLiteSecurityTest (cherry picked from https://android-review.googlesource.com/q/commit:155051037282ad7c23bfee3834c0b348208bcf49) Merged-In: I99ab5d3bef6e5aab2043400cade818b0789b8f44 Change-Id: I99ab5d3bef6e5aab2043400cade818b0789b8f44
2023-12-07Merge "Delete Apache license from the sqlite build script" into mainLee Shombert
2023-12-06Delete Apache license from the sqlite build scriptLee Shombert
The script that builds an Android patch of a SQLite distribution should not use the Apache 2.0 license. The script should be unencumbered like sqlite. Bug: 285936283 Test: compliance lint Change-Id: I5938a38783dce027baddf0bd0673e9015b283f24
2023-12-07Snap for 11186783 from d715b170fcdeb9b520855d79b90559e2348c2144 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ib7d982f5d3d47c55badb6fd6a1687d4efbaf3d40
2023-12-05Fix README after test module splitAleksandr Lukin
Recently we've split the CtsScopedStorageDeviceOnlyTest module into multiple ones. CtsScopedStorageDeviceOnlyTest is still present, in addition to new modules. So it should also be in Readme file. Change-Id: I265ca2f702ed04a2f83ec127908372e52b09175d Test: n/a Bug: 294741813
2023-11-30Snap for 11157599 from 8b4634569844b6f47bb92122731db2cbe4a93049 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I9f7fc796eee7ed8373d7ec62f8665980aed93b81
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3c am: 4f4ea35d1c ↵Treehugger Robot
am: 6dbfe214e5 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: Id350baa8ff29144f9a98f7b36755c6f96e8b6575 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3c am: 4f4ea35d1cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: I970aedc96584efbeb45979dd4a58e5857a0bbca5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3c am: ca3352e6be ↵Treehugger Robot
am: b71f093e91 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: Id0be6ec1611a4c90b015ec51787f4fa95d8a2f4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3c am: ca3352e6beTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: I4253a0a5f319fcc655b71a945376e4e207a44678 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: I61cbe22a61cf667c6ab8d98f843af2b03f587aba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into main am: 276a6a5c3cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2845002 Change-Id: I059738f8d41dd09fd3d25b7cd05b75f1efee5132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Enable AutoFDO for sqlite" into mainTreehugger Robot
2023-11-29Snap for 11151698 from 47c4c6033e023de7a5b40f119e3693de95d654ce to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ib4734492af135ee833eb74790149dfbfaf8dc442
2023-11-28Snap for 11146061 from 5acec8402b963d7dcf2f01d55afb191006cf738d to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: If42937df878e2f29930be89cf88017b715e9807d
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc am: 147fb33024 am: 2a2e98e509 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: I1daf45ef7293cf5df8baacb6d72c05a6a951fb29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc am: 147fb33024 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: I70156e0092707a5a65f070fb7bc378946f299c3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc am: 589e717605 am: 26753a780a Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: I1948373826ebe837f84e159af906ffd294021381 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc am: 589e717605 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: I5f471fa795db5d3e5b591985af17292ddab5389a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: If5e812e940ca32b49abc8e90afef77d89a913240 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into main ↵Michael Hoisie
am: 76685312cc Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2834775 Change-Id: I815e2fd1f573c3f1fe8e7bac29fbb6b7f1c0ede3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Merge "Use SQLITE_ENABLE_ICU build flag for host Linux and Mac" into mainMichael Hoisie
2023-11-23Enable AutoFDO for sqliteYi Kong
This allows compiler to better optimize sqlite using profiles gathered from users. Test: presubmit Change-Id: I1ea9a5d8b0f56a89758a2a752da21ef4f034e863
2023-11-22Change README after test module splitAleksandr Lukin
Recently we've split the CtsScopedStorageDeviceOnlyTest into multiple ones. Changing README accordingly. Change-Id: I7306a6c369d139d130be129ac5a35d0fc3991825 Test: n/a Bug: 294741813
2023-11-18Use SQLITE_ENABLE_ICU build flag for host Linux and MacMichael Hoisie
This makes the host variant of the 'sqlite' target consistent with the Android variant. When SQLITE_ENABLE_ICU is defined, several SQLite ICU extensions are enabled for host Linux and Mac, such as the `regexp` function. See https://sqlite.org/src/dir/ext/icu for more details. Host SQLite is used in tools like Robolectric and LayoutLib. All host platforms (Linux, Mac, and Windows) support ICU. There will be a follow-up CL to enable SQLITE_ENABLE_ICU for Windows, but the ICU dependency on Windows needs to be updated. Also enable a host variant for 'libsqlite_static_noicu' so binaries such as py2-launcher and perfetto will not need to include ICU libraries. Test: Robolectric sqlite database tests Bug: 308173442 Change-Id: I6a8de8f5719856dff173ca3e79c2e8afad748243
2023-10-07Snap for 10917888 from 1aa1005161f94cb710bbba1cb2e4064ce9c7d702 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I7fd167429604fa4895b973bd7541adb84923e268
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 6156861dc0 -s ↵Xin Li
ours am: c7ca270c85 -s ours am: 9f5fc96fb0 -s ours am: c77efb92ca -s ours am: 3a973b2361 -s ours am skip reason: Merged-In Id31d7140f3bac017865e0019084d3925558e3974 with SHA-1 8ad85b33d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2777029 Change-Id: If773647a1dc1621956e60276ba9f7b948d842542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: c3ac2c0304 -s ours am: 7ca9a61166 ↵Xin Li
-s ours am: 7dc10fafbf -s ours am: d6cfdd9741 -s ours am: b322ce2c9d -s ours am skip reason: Merged-In Id31d7140f3bac017865e0019084d3925558e3974 with SHA-1 8ad85b33d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2777029 Change-Id: Ia1cb27b60c24b526ac878decd7b8a15666b4b9b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 6156861dc0 -s ↵Xin Li
ours am: c7ca270c85 -s ours am: 9f5fc96fb0 -s ours am: c77efb92ca -s ours am skip reason: Merged-In Id31d7140f3bac017865e0019084d3925558e3974 with SHA-1 8ad85b33d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2777029 Change-Id: Ic544704fa7df2b0b19fd90ca449a1fe2423fb3f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 05:56:30 +0000