summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2e62e531e5 -s ours am skip reason: change_id I0f6fc526e80c5b9c7c69322eb515472954619817 with SHA1 a6a4a96fd1 is in history Change-Id: Id89fe40c6dfe58b65f67e58ab20f5857d587df1e
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I14bacd28db65608da0d1ceef80bd5f196420ffe6 Merged-In: I0f6fc526e80c5b9c7c69322eb515472954619817
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
04b394da8e -s ours am: 36e6d77b1e am: b505e6f243 am: ddde42f427 -s ours am skip reason: subject contains skip directive Change-Id: Ic6326a27734851365208e07970beb300a17886d0
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
04b394da8e -s ours am: 36e6d77b1e am: b505e6f243 Change-Id: Ibb73a1f18addf1fe72ca700329ecb687cf923b84
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
04b394da8e -s ours am: 36e6d77b1e Change-Id: I252c479e810e3c40f2e1919d2432b02ffa5b136b
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 04b394da8e -s ours am skip reason: subject contains skip directive Change-Id: I02658d49f1089fca6863522ee1bab086dcde4219
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I0f6fc526e80c5b9c7c69322eb515472954619817
2019-09-04sqlite3_android.cpp: disable _TOKENIZENick Kralevich
Comment out the tokenize function. This code doesn't appear to be used. A future change will further clean up this code and delete it properly. Bug: 139186193 Test: compiles and boots Change-Id: I0b2c37b6716162228205fc1ca8bea0f397f36baf (cherry picked from commit c52a17358593062a7eb75a023c115df9ad89563b)
2019-08-29Snap for 5838533 from dd0b74c3b7b6a262813f59c8b3b8bc8066eb65f9 to ↵android-build-team Robot
qt-qpr1-release Change-Id: Ife4603155ba5c706605de577a39cb6f259567d05
2019-08-27sqlite3_android.cpp: disable _TOKENIZE am: dd0b74c3b7Nick Kralevich
am: f1ee5348c8 Change-Id: Ia04ed792f53fea62ea7e740d3e13455942cfae1c
2019-08-27sqlite3_android.cpp: disable _TOKENIZENick Kralevich
am: dd0b74c3b7 Change-Id: I27d4bbf2878558c045b83f02dad21f8430209368
2019-08-27sqlite3_android.cpp: disable _TOKENIZENick Kralevich
Comment out the tokenize function. This code doesn't appear to be used. A future change will further clean up this code and delete it properly. Bug: 139186193 Test: compiles and boots (cherry picked from commit c52a17358593062a7eb75a023c115df9ad89563b) Change-Id: I5193c6fe95cbe6456d758eb44a7d8c53f5e2832d
2019-08-27sqlite3_android.cpp: disable _TOKENIZENick Kralevich
Comment out the tokenize function. This code doesn't appear to be used. A future change will further clean up this code and delete it properly. Bug: 139186193 Test: compiles and boots Change-Id: I0b2c37b6716162228205fc1ca8bea0f397f36baf
2019-08-06[automerger skipped] Merge "Support loose comparison using minimum matched ↵Hui Yu
chars" am: 39ceab0aea -s ours am: b251c3d3ad -s ours am: fc0152dead -s ours am: b9e1d45fc9 -s ours am: f5ed52e39b -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I120e976bf9c23ff194d34a03d0abc0f20ea0d059
2019-08-06[automerger skipped] Support loose comparison using minimum matched chars ↵Taesu Lee
am: 73e13d1078 -s ours am: 01aa7bd7c1 -s ours am: bb427b7296 -s ours am: c2920594f3 -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I207633ec899bab131489b5ad788f516bf7be3cb2
2019-08-06[automerger skipped] Merge "Support loose comparison using minimum matched ↵Hui Yu
chars" am: 39ceab0aea -s ours am: b251c3d3ad -s ours am: fc0152dead -s ours am: b9e1d45fc9 -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I67ab284ff7cbc3f999c04c58a96aee9f3afb7959
2019-08-06[automerger skipped] Support loose comparison using minimum matched chars ↵Taesu Lee
am: 73e13d1078 -s ours am: 01aa7bd7c1 -s ours am: bb427b7296 -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I946aa15165ab23419b375f6dff0d393e77247604
2019-08-06[automerger skipped] Merge "Support loose comparison using minimum matched ↵Hui Yu
chars" am: 39ceab0aea -s ours am: b251c3d3ad -s ours am: fc0152dead -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I940fe212337c46d6285e00d38c0c99c9d829890a
2019-08-06[automerger skipped] Support loose comparison using minimum matched chars ↵Taesu Lee
am: 73e13d1078 -s ours am: 01aa7bd7c1 -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: Iab4fe3867c628e145b0af7d70b4969fde756192d
2019-08-06[automerger skipped] Merge "Support loose comparison using minimum matched ↵Hui Yu
chars" am: 39ceab0aea -s ours am: b251c3d3ad -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I857fbc26e63019b864b73eb586a6e63651100d50
2019-08-06[automerger skipped] Support loose comparison using minimum matched charsTaesu Lee
am: 73e13d1078 -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 33fdf2ebea is in history Change-Id: I42e94e40703821f0d87b5d353c5fe0fd75d4d879
2019-08-06[automerger skipped] Merge "Support loose comparison using minimum matched ↵Hui Yu
chars" am: 39ceab0aea -s ours am skip reason: change_id I2f1355c4ba712170464e4c23a916024e0bf58e71 with SHA1 73e13d1078 is in history Change-Id: I0200887aa8a9740288f1b1ebf43920f93e77dc63
2019-08-05Support loose comparison using minimum matched charsTaesu Lee
Specific min match is required for each country. Test: Manual Change-Id: I2f1355c4ba712170464e4c23a916024e0bf58e71 Merged-In: I2f1355c4ba712170464e4c23a916024e0bf58e71 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com> Bug:134246556 (cherry picked from commit 33fdf2ebeaa9f26948a54d0f733719c91e907491)
2019-08-05Merge "Support loose comparison using minimum matched chars"Hui Yu
2019-08-05Support loose comparison using minimum matched charsTaesu Lee
Specific min match is required for each country. Test: Manual Change-Id: I2f1355c4ba712170464e4c23a916024e0bf58e71 Merged-In: I2f1355c4ba712170464e4c23a916024e0bf58e71 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com> Bug:134246556
2019-08-04Support loose comparison using minimum matched chars am: 33fdf2ebea am: ↵Taesu Lee
9e93fe299d am: 588bff0250 Change-Id: Iaaeea811978e21f297da869c5c4b58f38332e639
2019-08-04Support loose comparison using minimum matched chars am: 33fdf2ebeaTaesu Lee
am: 9e93fe299d Change-Id: I122f4183c8bbca7e404aaa4f45a410a77d810d01
2019-08-04Support loose comparison using minimum matched charsTaesu Lee
am: 33fdf2ebea Change-Id: I22222da12297bbf461e947d0513e3cef12897eca
2019-07-18Support loose comparison using minimum matched charsTaesu Lee
Specific min match is required for each country. Test: Manual Change-Id: I2f1355c4ba712170464e4c23a916024e0bf58e71 Merged-In: I2f1355c4ba712170464e4c23a916024e0bf58e71 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com> Bug:134246556
2019-07-15Merge "libsqlite: remove unused deps" am: 1c54a19a06 am: 058c2ff898 am: ↵Steven Moreland
47092a72a0 am: 5ec909f875 Change-Id: Ice0033318d505eecf18cd1f1430511f6ed257250
2019-07-15Merge "libsqlite: remove unused deps" am: 1c54a19a06 am: 058c2ff898Steven Moreland
am: 47092a72a0 Change-Id: Icdaa6bc1c3909259fcf96f88ed9f64af00a05462
2019-07-15Merge "libsqlite: remove unused deps" am: 1c54a19a06Steven Moreland
am: 058c2ff898 Change-Id: I870e1c9598d116dc57c4a1af0a1073ecd5c3dd41
2019-07-15Merge "libsqlite: remove unused deps"Steven Moreland
am: 1c54a19a06 Change-Id: I981287dcbdbb96163ba5f2d4e078162cfb0134ba
2019-07-15Merge "libsqlite: remove unused deps"Treehugger Robot
2019-07-15Merge "Remove all ICU integration for sqlite on host" am: 6ba0946797 am: ↵Neil Fuller
91b267d05b am: 6e0e1ce43e am: 1cfe6b189d Change-Id: I7ac4cf38463591fa3b597ae57d195266c3f02498
2019-07-15Merge "Remove all ICU integration for sqlite on host" am: 6ba0946797 am: ↵Neil Fuller
91b267d05b am: 6e0e1ce43e Change-Id: I122a8590c699f1b0473de0876e1bfd2a3d1c3cfa
2019-07-15Merge "Remove all ICU integration for sqlite on host" am: 6ba0946797Neil Fuller
am: 91b267d05b Change-Id: Ic89b4a57615f34a5fc9a177ac908049220f1df4d
2019-07-15Merge "Remove all ICU integration for sqlite on host"Neil Fuller
am: 6ba0946797 Change-Id: I5bddf8d087d0464f41140cabdedb58e8ff52a4cf
2019-07-15Merge "Remove all ICU integration for sqlite on host"Neil Fuller
2019-07-11libsqlite: remove unused depsSteven Moreland
Bug: 137311188 Test: library still builds Change-Id: I9702db5f804fc241d1ae88dfae0e270fe45ca4c1
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 7ef102eeee am: e879e9ece8 -s ours am skip reason: subject contains skip directive Change-Id: Ia40ebf13419ae583cbb524f4468c56577c92bf1d
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 7ef102eeee Change-Id: I2fe7564e873b5a0eed8f7b08be48c090ac2f5f87
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I07ca269a50528444f006c60cba057f27b9f382f5
2019-06-21Remove all ICU integration for sqlite on hostNeil Fuller
Maintaining external/icu for non-device usecases is becoming an increasing burden and there are no tests around sqlite / libsqlite on host that indicate what support is needed. There doesn't appear to be any ICU initialization code in place on host suggesting ICU usage is limited to functions that don't require data. This change removes ICU integration with sqlite on host entirely to try to flush out affected users. If there are no complaints that will be one less dependency to worry about. Bug: 130787951 Test: build / treehugger Test: Ran sqlite3 on host Change-Id: Icd1eb97281d941a3f55c4289b6d65fe5921ed542
2019-06-14Merge "sqlite: Upgrade to SQLite 3.28.0" am: f26d1a1b9c am: 55ded3b95d am: ↵Haibo Huang
ae74719fd1 am: 2e0c7b8a0f Change-Id: Ia04158d9e44afcf89fcfb9910a2514f2e63ac8c6
2019-06-14Merge "sqlite: Upgrade to SQLite 3.28.0" am: f26d1a1b9c am: 55ded3b95dHaibo Huang
am: ae74719fd1 Change-Id: Ia435dee97b91c6e66b04841b7566727804388592
2019-06-14Merge "sqlite: Upgrade to SQLite 3.28.0" am: f26d1a1b9cHaibo Huang
am: 55ded3b95d Change-Id: I596e4fa43fbebcaf9393504708cf568f3dd6702b
2019-06-13Merge "sqlite: Upgrade to SQLite 3.28.0"Haibo Huang
am: f26d1a1b9c Change-Id: I2f1bd4d8ad6ea37c62dabf6aa32eafae270253de
2019-06-13Merge "sqlite: Upgrade to SQLite 3.28.0"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 13:11:04 +0000