aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Idd5a468f9655fec65e926f76cdf9675c2883f8cb Change-Id: I1a3b7092dcb00c3f80472e70aff91a3505d5582b
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I3e49fbcc3500be5f8f52f3cf711cc204d04826a2 Change-Id: Idd5a468f9655fec65e926f76cdf9675c2883f8cb
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s ours am: ↵Xin Li
edda0dcccd -s ours am: 5400016891 -s ours am skip reason: Merged-In I2120590a4e196926822a54a14e5d70df8198fe77 with SHA-1 f8d77bb18b is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2866380 Change-Id: Ia6d596fb47a048335190f99dbab002d012ab4d0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s ours am: ↵Xin Li
edda0dcccd -s ours am skip reason: Merged-In I2120590a4e196926822a54a14e5d70df8198fe77 with SHA-1 f8d77bb18b is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2866380 Change-Id: I666f3bf5688df8dea21e3e1a4520e2677deb0f9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s oursXin Li
am skip reason: Merged-In I2120590a4e196926822a54a14e5d70df8198fe77 with SHA-1 f8d77bb18b is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2866380 Change-Id: I3e49fbcc3500be5f8f52f3cf711cc204d04826a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I2120590a4e196926822a54a14e5d70df8198fe77 Bug: 315507370 Change-Id: Idf61a0c180953af6966fe1c352acdac66f7e79cf
2023-10-19[automerger skipped] Merge 10952656 am: f8d77bb18b -s ours am: 58394e0c7e -s ↵Xin Li
ours am skip reason: Merged-In Icf56d6aa5db02b5b95ae2c42ef62d0e8383c5771 with SHA-1 b28a395c8e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/25092506 Change-Id: I4641d0681d65be11b5e27cbdec906eb0321a0ade Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: f8d77bb18b -s oursXin Li
am skip reason: Merged-In Icf56d6aa5db02b5b95ae2c42ef62d0e8383c5771 with SHA-1 b28a395c8e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/25092506 Change-Id: I125448c8fd3f3a70ee8c4c7a8b11c0318bdc82e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Icf56d6aa5db02b5b95ae2c42ef62d0e8383c5771 Change-Id: I2120590a4e196926822a54a14e5d70df8198fe77
2023-10-07[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 ↵Xin Li
-s ours am: fc6249a35b -s ours am: 7d95ab97bd -s ours am: b28a395c8e -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 39a90147d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2776928 Change-Id: I246773a0acb09cb2a6e15fbbc5c97d338a34e668 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 ↵Xin Li
-s ours am: fc6249a35b -s ours am: 7d95ab97bd -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 39a90147d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2776928 Change-Id: Icf56d6aa5db02b5b95ae2c42ef62d0e8383c5771 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 ↵Xin Li
-s ours am: fc6249a35b -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 39a90147d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2776928 Change-Id: Ifb39abec35798c42f0df9db2244abd2b78853b98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 ↵Xin Li
-s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 39a90147d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2776928 Change-Id: I00618c4cdeed054103a29b617c9ef6ffba31946e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s oursXin Li
am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 39a90147d5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2776928 Change-Id: I32bc7cfbb55457c339d40cacb121a6d939fd4a89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I1029aa1b218753f3b761cff4718320b76348deca Change-Id: I5467434ddfc52882a05b61839eebe772c810f01e
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ↵Xin Li
ab7970c3f0 -s ours am: 3136dd536f -s ours am: 2abf0e504b -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 dfac6c3006 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24624533 Change-Id: Ie8e11460cf588ad8d7682f60daad30b5f8d24b56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ↵Xin Li
ab7970c3f0 -s ours am: 3136dd536f -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 dfac6c3006 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24624533 Change-Id: I73768f0abb4322650ce756d2037cddcef0fa8ad3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ↵Xin Li
ab7970c3f0 -s ours am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 dfac6c3006 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24624533 Change-Id: I8e36dc8bd041d1d19866063d56dcdb42287397a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s oursXin Li
am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 dfac6c3006 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24624533 Change-Id: I979b4c00e66607182d24be4b158c657dbfb213bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge UP1A.230905.019tmp_amf_298295554Xin Li
Merged-In: I1029aa1b218753f3b761cff4718320b76348deca Change-Id: I7ee134beb513cafcba525ca580559ea5b8398b2d
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours ↵Xin Li
am: 2f040758b5 -s ours am: 630c0ad8db -s ours am: c88f5c9a45 -s ours am skip reason: Merged-In Ifc0cf4bd8aaded017a4e14e79c90a82a44b21b44 with SHA-1 44425b59f9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24180528 Change-Id: I6304b8b79b01aa7e8d0bbc669891ca589714340e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours ↵Xin Li
am: 2f040758b5 -s ours am: 630c0ad8db -s ours am skip reason: Merged-In Ifc0cf4bd8aaded017a4e14e79c90a82a44b21b44 with SHA-1 44425b59f9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24180528 Change-Id: I7876a9151f19317aa220e38217f4ba038c55f8ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours ↵Xin Li
am: 2f040758b5 -s ours am skip reason: Merged-In Ifc0cf4bd8aaded017a4e14e79c90a82a44b21b44 with SHA-1 44425b59f9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24180528 Change-Id: I5037bd4a91c9f15cd20f091ae82e482c2fb9a4c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s oursXin Li
am skip reason: Merged-In Ifc0cf4bd8aaded017a4e14e79c90a82a44b21b44 with SHA-1 44425b59f9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24180528 Change-Id: I278c3d1ba033cc5e889cd84ed6e4ab867ef8a403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Ifc0cf4bd8aaded017a4e14e79c90a82a44b21b44 Change-Id: I02f82b8eab1a445b0da6b8c608d91d4fc83f48ad
2023-07-27[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' ↵Jörg Wagner
into udc_d1 am: b0ff36ab8d am: dc3c19e719 -s ours am: a6183d5eea -s ours am skip reason: Merged-In I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e with SHA-1 dac67ca2d5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24142533 Change-Id: I482c47381a27651cbe94299217eb79e8fec105df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] Compile ArmNN shim over the support library am: ↵Renato Grottesi
cdf7e04e3b -s ours am: 9411788bfe -s ours am: 136ed83de5 -s ours am skip reason: Merged-In I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b with SHA-1 156544ab17 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24142925 Change-Id: I9127d38b03a8918dcfcf8772371458d9030475f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' ↵Jörg Wagner
into udc_d1 am: b0ff36ab8d am: dc3c19e719 -s ours am skip reason: Merged-In I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e with SHA-1 dac67ca2d5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24142533 Change-Id: Iec99806468abd45c92154bf88f1a4e06ba3f0897 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] Compile ArmNN shim over the support library am: ↵Renato Grottesi
cdf7e04e3b -s ours am: 9411788bfe -s ours am skip reason: Merged-In I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b with SHA-1 156544ab17 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24142925 Change-Id: Iaef2b8b9739d0f861000355a188612ffe5aa84b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8dJörg Wagner
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058492 Change-Id: I2675fa950aa8f729125f9067c5334bce4b924e02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e Merged-In: I2ebae622c183bd1bc3795763a7c0394c68bdf72f
2023-07-26[automerger skipped] Compile ArmNN shim over the support library am: ↵Renato Grottesi
cdf7e04e3b -s ours am skip reason: Merged-In I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b with SHA-1 156544ab17 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058491 Change-Id: I835e1769e978c236bd0cfda12a9dc00b895e7452 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' ↵Renato Grottesi
into udc_d1 am: b0ff36ab8d am: 83a2dedd5d am: 6fc4302d9b -s ours am skip reason: Merged-In I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e with SHA-1 dac67ca2d5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24144424 Change-Id: I71bf339fab4085eab56cd322425a2c9135ca91ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25[automerger skipped] Compile ArmNN shim over the support library am: ↵Renato Grottesi
cdf7e04e3b am: 8f0ed0e336 -s ours am: b8a2371665 -s ours am skip reason: Merged-In I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b with SHA-1 156544ab17 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058491 Change-Id: I182b700dfdd8cd2bd91753670849278c44b00d7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: ↵Renato Grottesi
b0ff36ab8d am: 83a2dedd5d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058492 Change-Id: I200ca683b8b67bf3ad1031ff8f5f276386eb04f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e Merged-In: I2ebae622c183bd1bc3795763a7c0394c68bdf72f
2023-07-20[automerger skipped] Compile ArmNN shim over the support library am: ↵Renato Grottesi
cdf7e04e3b am: 8f0ed0e336 -s ours am skip reason: Merged-In I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b with SHA-1 156544ab17 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058491 Change-Id: Ic5a2c7f77728ca8b74e50f9f52840f349acddd21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8dRenato Grottesi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058492 Change-Id: Iea158aab5e59c28ebe5ea7fe1fb2d0430e19822c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Compile ArmNN shim over the support library am: cdf7e04e3bRenato Grottesi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058491 Change-Id: Ie85de1810864cbae8e77796f2b7b3191db06d34e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge cherrypicks of ['googleplex-android-review.googlesource.com/23785405', ↵android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/23832246'] into udc-release. Change-Id: I221e71303822f99f11f122cc8992925e1652d35c
2023-07-18android-nn-driver: avoid hardcoding specificity arrayGuus Sliepen
When checking which dimensions in an array of dimensions is specified, the array holding the specificity has a hardcoded size. Since we cannot use std::vector<bool>, use a std::basic_string<bool> to hold the specificity array. Bug: 234351141 Test: manual run of fuzzer (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dfac6c30069dec13947fae41870f72cae0898d95) Merged-In: I1029aa1b218753f3b761cff4718320b76348deca Change-Id: I1029aa1b218753f3b761cff4718320b76348deca
2023-07-18android-nn-driver: prevent out of bounds readGuus Sliepen
Add a missing check in executeFenced() that fence handles have a filedescriptor associated with them. Bug: 256590035 Test: manual verification (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:671afb13d1acf98b836e0b7afb5cd14d787d74b1) Merged-In: Ib571f268c9ee3fe674b6ef83ed5553e49b541736 Change-Id: Ib571f268c9ee3fe674b6ef83ed5553e49b541736
2023-07-14Merge remote-tracking branch 'goog/main' into udc_d1Renato Grottesi
Compile ArmNN shim over the support library Disabling the android-nn-driver project that built the old HIDL NNAPI service. The new AIDL service is build from external/armnn/shim. This project will be completely removed as a follow up step. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Merged-In: I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e Change-Id: I2ebae622c183bd1bc3795763a7c0394c68bdf72f
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the ↵Renato Grottesi
support library" am: 4ab3546f33 am: 0a9124a70c -s ours am: c06ea07f28 -s ours am: 88cd7e4213 -s ours am: dd46ad267a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2653623 Change-Id: I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the ↵Renato Grottesi
support library" am: 4ab3546f33 am: 0a9124a70c -s ours am: c06ea07f28 -s ours am: 88cd7e4213 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2653623 Change-Id: I919a165ab5a5d54391ab4001e749df2f4dd36a8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the ↵Renato Grottesi
support library" am: 4ab3546f33 am: 0a9124a70c -s ours am: c06ea07f28 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2653623 Change-Id: If991f4b911cfdce9f95bcfcfb63da330667938a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Compile ArmNN shim over the support libraryRenato Grottesi
Disabling the android-nn-driver project that built the old HIDL NNAPI service. The new AIDL service is build from external/armnn/shim. This project will be completely removed as a follow up step. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Merged-In: I05db9ccc0f86dd196eaf73ede6fda4c52fcd2b8b Change-Id: I69b508772da60848579b46b1bfa446234e8bb0ca
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the ↵Renato Grottesi
support library" am: 4ab3546f33 am: 0a9124a70c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2653623 Change-Id: Ia21c31aa3b086a9beed78f537c57781c00c76dbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library" am: ↵Renato Grottesi
4ab3546f33 Original change: https://android-review.googlesource.com/c/platform/external/android-nn-driver/+/2653623 Change-Id: I5c149ef0de719d0923aa60e24816855e49b6a559 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library"Renato Grottesi
Disabling the android-nn-driver project that built the old HIDL NNAPI service. The new AIDL service is build from external/armnn/shim. This project will be completely removed as a follow up step. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Change-Id: I86cf2a417239ad3a0b2e113deb454723c49d4392
2023-07-13Merge "Revert^4 "Compile ArmNN shim over the support library"" into mainRenato Grottesi
2023-07-13Revert^4 "Compile ArmNN shim over the support library"Renato Grottesi
41e2b422933a4bc21e9fe5d2d62ef2bd836623b2 Disabling the android-nn-driver project that built the old HIDL NNAPI service. The new AIDL service is build from external/armnn/shim. This project will be completely removed as a follow up step. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Change-Id: I3d429830f7780a1665f65a75a65fc8113037837e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 13:45:52 +0000