summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-04Snap for 11173240 from dc6eff193d61657e4c6c6a33daf0808add91986c to ↵aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000android14-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: Ifb0abd42a3dffb8253e7ddf2dab17027a2092a4d
2023-09-11Fix module controller for tplus testsRobert Marcus
Bug: 287415447 Test: presubmit Change-Id: I4234adccb4cf359053713d156455777fdc72a6d4
2023-09-04Snap for 10758424 from e81972289359d52b77ca0ca41436da53a4725652 to ↵aml_sdk_341110080aml_sdk_341110000Android Build Coastguard Worker
mainline-sdkext-release Change-Id: Idfe1b8709e4cf2baa2c19c46c90401d76a9a197e
2023-08-04Snap for 10611567 from 35b28a503b24937f56c11e4de4d7aba18e225c1a to ↵aml_sdk_341010000Android Build Coastguard Worker
mainline-sdkext-release Change-Id: Ic796bb9bef702feb8e2e16351e8136d82926610a
2023-07-27Allow ODP module to access libtextclassifier_hash_headers library.qiaoli
Test: mma Bug: 277775356 Change-Id: Id038036210b9ea9aa216749722d733ebf6e389b7
2023-07-21Update tplus to have min_sdk_version 33Robert Marcus
Test: presubmit Bug: 291775136 Bug: 292157828 Change-Id: Ibc1309a97665343ab7bfff4405a8fce9b7ac003b
2023-07-18Snap for 10513376 from 61704905f2aeb40b0f506fe889bc4c2eb526fdb8 to ↵aml_sdk_340912010Android Build Coastguard Worker
mainline-sdkext-release Change-Id: I2a3e731b016c61f5497658f2b073ad5800782097
2023-07-12Snap for 10482350 from fea676896127c717169504393796a97cad9ea5c0 to ↵Android Build Coastguard Worker
mainline-sdkext-release Change-Id: I8f47981971cb3aa39b06e7d6c99c99fa4e6ea167
2023-07-12Revert^2 "Rename first variant for ExtServices to _tplus."Neha Pattan
fea676896127c717169504393796a97cad9ea5c0 Change-Id: I87c3764063968cc7712c06e5ba925c5f97a95497
2023-07-11Revert "Rename first variant for ExtServices to _tplus."Greg Kaiser
Revert submission 23924907-rename-ext-variant Reason for revert: Suspect in b/290808342 Reverted changes: /q/submissionid:23924907-rename-ext-variant Change-Id: I47d2fbd19e55283a4ce2e8d01aa4621bc6389c2a
2023-07-07Snap for 10453563 from 30c4f7914598ea987d8c430a344a1bc916aee338 to ↵Android Build Coastguard Worker
mainline-sdkext-release Change-Id: I8344995f5d0e7d80f98f7c707939f15094e3cd27
2023-07-06Rename first variant for ExtServices to _tplus.Neha Pattan
Test: atest Bug: 282185097 Change-Id: I80a13f04c012163ad4a44823906f8c73a1e112af
2023-05-31Disable flaky ModelDownloader integration tests. am: 5247b140e9Chang Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/23472318 Change-Id: Id4dda3442225c745e45cf44f31ada7e8ba1e6b56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30Disable flaky ModelDownloader integration tests.android14-devChang Li
Bug: 284901878 Change-Id: I854ba66b4f1cf524ac7e9519b6105b4ceffe8179
2023-05-26Set compile_multilib to be "both"Tony Mak
BUG: 274028926 Change-Id: I4b2815541704c618d9e732fc3f36d2f3529208fc
2023-03-07Snap for 9701827 from ec408496521e0cacde1da336aa63041bf424d444 to ↵aml_sdk_331812000aml_sdk_331811000android13-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: Ib7338d4cf5266d4202016a2c7fd6553596ba1290
2023-03-01[automerge] Fix the missing "in" locale 2p: ec40849652 am: 768ac62e17Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/21566808 Change-Id: I4c5962b050147c3056209cbd23ebff70d6922cac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[automerge] Fix the missing "in" locale 2p: ec40849652Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/21566808 Bug: 230442199 Change-Id: I20cba036fd09e2fdb8d8a3b445b2f1c18d615f00
2023-02-24Fix the missing "in" localeTony Mak
BUG: 230442199 Change-Id: I4b4478c5188ea0ec09022d52991a49962bbb8f51
2023-02-15Merge "Revert "Add DeviceConfig permissions to CTS tests.""Tsung-Mao Fang
2023-02-15Revert "Add DeviceConfig permissions to CTS tests."Ted Bauer
Revert submission 20961419-deviceconfig-restrict Reason for revert: CTS breakage Reverted changes: /q/submissionid:20961419-deviceconfig-restrict Change-Id: Ib525ec885ca357b019eb0982097a08a2ac90d20f
2023-02-14Merge "Add DeviceConfig permissions to CTS tests."Ted Bauer
2023-02-02Disable flaky integration test.Chang Li
Bug: 267344737 Change-Id: I8ae54845f1c82854ea913ee3ffefbd8a16294001
2023-02-01Add DeviceConfig permissions to CTS tests.Ted Bauer
Bug: 251818659 Test: m Change-Id: Id2d9e74f4e8ef781359b2de65e8be9fd6c05159f
2022-12-05Snap for 9368510 from c70f00ec748f9c1e5dbb4060e4696ce3a2187f72 to ↵aml_sdk_331811100aml_sdk_331412000aml_sdk_331410000Android Build Coastguard Worker
mainline-sdkext-release Change-Id: Ia9b85c9cb921b3ccae604ba42af90a95f178ce2b
2022-11-09[automerge] Export the code to fix b/218977698 2p: c70f00ec74Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/20425370 Change-Id: I2b062255bbe097d8e2c81aa6a6172c68487ec6df
2022-11-09Export the code to fix b/218977698Tony Mak
Fixes: 218977698 Change-Id: Ib1eb148845b1b1ee4ab9192f5e3dd78c00a594ec
2022-11-09Snap for 9271768 from 1075b1e4e39ab4af90deb3758e5631943c07d47e to ↵aml_sdk_331310010Android Build Coastguard Worker
mainline-sdkext-release Change-Id: If025cebdc7cb7150ee7d84fc3bcf200b2c556d46
2022-09-12[automerge] Export external/libtextclassifier to AOSP. 2p: 1075b1e4e3Chang Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/19932204 Bug: 187927611 Change-Id: I314d2899800a28315764686529d6b1d7e03556c6
2022-09-12Export external/libtextclassifier to AOSP.Chang Li
BUG: 187927611 Change-Id: I3cb548bbaa4a0013909ac82fa1dd50b254dd633e
2022-09-12Snap for 9051867 from 5fec2fd5475e29f3fc41f86c0e5060ce433b3182 to ↵aml_sdk_331111000Android Build Coastguard Worker
mainline-sdkext-release Change-Id: I07be37e3380c2e2f0c3f6eb95f2216c460adf400
2022-09-08[automerge] Export from google3 to AOSP. 2p: 5fec2fd547Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/19886984 Change-Id: I33e5739c16d4340543dc9e271b2015e137e43fc5
2022-09-08Export from google3 to AOSP.Chang Li
Change-Id: I669d4ecf743986666651a41fec1b6ed7cb58dcec
2022-08-27Update Android.bp following external/flatbuffers rebase am: caa8c1033a am: ↵Miao Wang
0da9668207 am: 262c46b195 am: 62ff054c6b am: 0c255e1ffc Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2193466 Change-Id: I43640cd5b26210c776f4186662927d69e43cced3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27Update Android.bp following external/flatbuffers rebase am: caa8c1033a am: ↵android-u-beta-1-gplmain-16k-with-phonesMiao Wang
0da9668207 am: 262c46b195 am: 62ff054c6b Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2193466 Change-Id: Ief65091158980f1630af687d1243834a748ed3ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27Update Android.bp following external/flatbuffers rebase am: caa8c1033a am: ↵Miao Wang
0da9668207 am: 262c46b195 Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2193466 Change-Id: I83cb4ecadfb2de8a2a10a4ca3f0127231fd4785e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27Update Android.bp following external/flatbuffers rebase am: caa8c1033a am: ↵Miao Wang
0da9668207 Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2193466 Change-Id: Ieb632a4a36a84afd4b2fa6cc850b76c7309d0950 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27Update Android.bp following external/flatbuffers rebase am: caa8c1033aMiao Wang
Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2193466 Change-Id: I4176b6aa472804a078b0f2355731a21bc8df8edf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24Update Android.bp following external/flatbuffers rebasemain-16kMiao Wang
Adds libflatbuffers-cpp dependency to libtextclassifier and libjvm_test_launcher Test: mm Change-Id: I5ecb7fb47fb404b357865cd9349ed702f13960e0
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65cdfd520b -s ours ↵Xin Li
am: 10190bbebe -s ours am: be4e7952a5 -s ours am: 953a7e5d29 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2186758 Change-Id: I83bd0c16f64a98b8fa2aa78ab811737e451d57bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65cdfd520b -s ours ↵Xin Li
am: 10190bbebe -s ours am: be4e7952a5 -s ours am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2186758 Change-Id: Ifc38adbd321cd9e2b60be9995405e7e0cf428422 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65cdfd520b -s ours ↵Xin Li
am: 10190bbebe -s ours am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2186758 Change-Id: If881dbaa5199477cc21a6af389c3b0700857cc6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65cdfd520b -s oursXin Li
am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2186758 Change-Id: I6f8062bf40d26274c84140e6089c865c289d0e6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df Change-Id: I4ce91da6c0e87835ea7f64897a993440c09a7062
2022-07-04[automerger skipped] Set min_sdk_version am: 8f5088ac2c am: 68aef603fb -s ↵Jooyung Han
ours am: f06bbb6d87 -s ours am: 02e93ce6d3 -s ours am: 180f7dd99a -s ours am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2139232 Change-Id: I4ccf8bb00cdd8d1b6aac600c258913aa2df18b92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Set min_sdk_version am: 8f5088ac2c am: 68aef603fb -s ↵Jooyung Han
ours am: f06bbb6d87 -s ours am: 02e93ce6d3 -s ours am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2139232 Change-Id: I759560471e8323e78d16cc6ed2385c6aaebd1ec4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Set min_sdk_version am: 8f5088ac2c am: 68aef603fb -s ↵Jooyung Han
ours am: f06bbb6d87 -s ours am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2139232 Change-Id: I66d677d98b404d972733828a9b167134924a162d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Set min_sdk_version am: 8f5088ac2c am: 68aef603fb -s oursJooyung Han
am skip reason: Merged-In I8d4e3fd512068cfdefe44d3952ef35e4aaabc6df with SHA-1 ab61f02d18 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2139232 Change-Id: Ia5bdf7fffb53104edb0da50ed5bcf9da96522ab8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Set min_sdk_version am: 8f5088ac2ctemp_sam_242648940Jooyung Han
Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2139232 Change-Id: I9e787d09fb97bc3c9b88037481bb89a510d18fb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
abd1687e05 -s ours am: e3330c6c02 -s ours am: 7521f3903b -s ours am: cf9ec35e77 -s ours am skip reason: Merged-In I14f950e4101027d1a6596fd1c459c4c4440b8379 with SHA-1 84b3aa147e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/19094726 Change-Id: Ie77cc708af00cd17093821acf20a4541f1e1679b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>