aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: dfedb81dd0 Change-Id: I7981493ce9f369838976397c3f6f19fe0d2b06e7
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Icd86b3b4b9f5b61897d5d24c63274058100da20c
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: If958eb7b788b1212c51b1720b196ae4b253e1d15
2019-01-29Merge "Add scalar_logistic_op to Eigen" am: c919bd67ed am: f9dfe43497Miao Wang
am: e5478941ad Change-Id: I4d1b501077f1852095cc4c82ac66dc44f8b0b666
2019-01-29Merge "Add scalar_logistic_op to Eigen" am: c919bd67edMiao Wang
am: f9dfe43497 Change-Id: Ica1e1505f7206f90704c5960300e32ab263edc56
2019-01-29Merge "Add scalar_logistic_op to Eigen"Miao Wang
am: c919bd67ed Change-Id: I47456ee21f6669902ab9e8e263b87990ecacefb9
2019-01-29Merge "Add scalar_logistic_op to Eigen"android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseMiao Wang
2019-01-17Add scalar_logistic_op to EigenMiao Wang
Test: mm Change-Id: Ib09c5bb5adeef356fc42cbe8a2edfda4c727c536
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 42a8b92eba -s ours am: a8a4fc30bd -s ours am: f48a3ad6c1 -s ours Change-Id: I87196c5bd60d522501150871efc29bea8611fc3d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 42a8b92eba -s ours am: a8a4fc30bd -s ours Change-Id: I7581673d63a62fd46130cdb2cc5056e96579a9b0
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 42a8b92eba -s ours Change-Id: I1199856133b68e097add206c1b88558667850c8a
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Bill Yi
Change-Id: Ic6a000a75351f0a6cb063ef80abe945ff4e3a4bd
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 10fd2e5450 -s ours am: 19aab3dc58 -s ours Change-Id: Ic1ab61f3392a50437ffc29c67ba5b0469cd13aff
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 10fd2e5450 -s ours Change-Id: Ie69d412d0a40816081d4639563c27ad8eb9e296f
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I830af8f6ec8ed6d976e231954d8c98971c55de29
2018-07-02Merge "Fix for HDRNet producing nondeterministic results." am: d6d227a99f ↵David Gross
am: 1b13c5e03d am: ba41e2f49e Change-Id: I9f4c024fa941e4d86157b6c0f56dc55407c0685a
2018-07-02Merge "Fix for HDRNet producing nondeterministic results." am: d6d227a99fDavid Gross
am: 1b13c5e03d Change-Id: Ie86bc94d8e371e824e8584718a8ac9aefae6982f
2018-07-02Merge "Fix for HDRNet producing nondeterministic results."android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseDavid Gross
am: d6d227a99f Change-Id: Icff55766867b5652aedd13820c6848107f90fd33
2018-07-02Merge "Fix for HDRNet producing nondeterministic results."android-o-mr1-iot-release-1.0.2David Gross
2018-06-29Fix for HDRNet producing nondeterministic results.David Gross
Eigen reads and writes volatile scalars to allow thread A to communicate to thread B that data written by thread A is available for thread B to read. However, volatile on Android doesn't guarantee ordered accesses, so it's not certain that after thread B sees the volatile write from thread A that data written by thread A is actually visible to thread B. The solution is to replace those volatile scalars with std::atomic<>. There might be an alternative with better performance (such as imposing looser ordering constraints than the default std::atomic<> ordering constraints). Bug: 109953668 Test: NeuralNetworksTest_static Test: adb shell am instrument -e class \ "com.example.android.nn.benchmark.NNTest#testNNAPI11Seconds[hdrnet_float]" \ -w com.example.android.nn.benchmark/android.support.test.runner.AndroidJUnitRunner # test device (including neural networks runtime) is aosp_walleye-userdebug # bench is from goog/master # also ran with mobilenet_float in place of hdrnet_float # could not reproduce problem in this environment; reproduced on # an internal branch on unreleased hardware Change-Id: Idea6e4b0a3db168dce5915c1beacb643267f3ec6
2018-03-04Snap for 4632767 from 30c5ae43fa590b0f0afa598081b30d3a236f1654 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-p-preview-5android-p-preview-4android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcandroid-build-team Robot
Change-Id: I14304f6cb8103bc5aed4acca0c006c78e98bc7d7
2018-03-01Merge "Reformat Android.bp file" am: 1d5d34618a am: 9b25b2e567android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devLogan Chien
am: afaf65caac Change-Id: I1bf504eccfdb019bf8f301ef71afa89acba7bcb5
2018-03-01Merge "Reformat Android.bp file" am: 1d5d34618aLogan Chien
am: 9b25b2e567 Change-Id: I5b063d3a7b1fd07535334aa6764a128e3342d471
2018-03-01Merge "Reformat Android.bp file"Logan Chien
am: 1d5d34618a Change-Id: I0af93f2d0527764421df7748d4d5fab6a7ebd065
2018-03-01Merge "Reformat Android.bp file"android-wear-p-preview-2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Logan Chien
2018-02-27Reformat Android.bp fileLogan Chien
This commit replaces `=` with `:`, which is more idiomatic. Test: aosp_sailfish-userdebug builds Change-Id: Id1c31368ab5acf9f1009f410c8b5ec2a7fe9c0e5
2017-12-19Snap for 4509671 from d4979a3747e59a774accfd32761cac4e52aa8903 to pi-releaseandroid-p-preview-1p-preview-1android-build-team Robot
Change-Id: I35f038649797841d01f37f10f3f9f81a872c46e6
2017-12-19Merge "Remove the workaround for Eigen sigmoid_op" am: ede6582296 am: 05fe67c386Miao Wang
am: 00175dcad8 Change-Id: I9dba5adc6860f18e446a081d9d6e3244f485c2ce
2017-12-19Merge "Remove the workaround for Eigen sigmoid_op" am: ede6582296Miao Wang
am: 05fe67c386 Change-Id: I4c19021f7f8458035d166e17cf9476b339e151f9
2017-12-19Merge "Remove the workaround for Eigen sigmoid_op"Miao Wang
am: ede6582296 Change-Id: I3982701e8b37ae85e05b1336e454aad5a7d4062e
2017-12-19Merge "Remove the workaround for Eigen sigmoid_op"Treehugger Robot
2017-12-18Remove the workaround for Eigen sigmoid_opMiao Wang
Test: mm Change-Id: I595f302a591e0f1fb8cd3549926ea29e8e446401 Merged-In: I595f302a591e0f1fb8cd3549926ea29e8e446401
2017-12-11Snap for 4496165 from 27ef72d57481d30746748836996881b7b359e0dc to pi-releaseandroid-build-team Robot
Change-Id: I311ef41b561dd8d0632f4c9cfe78aa15cbd42aa9
2017-12-08Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 92c16a1393 -s ours am: ↵Xin Li
d4f56f6416 am: bb839ac14c -s ours Change-Id: I64f8fad32eecc70cddced78146ec4f052a4fc323
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: Ibccf6983a3d30681752af36a369bcdf7325ac251
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 92c16a1393 -s oursXin Li
am: d4f56f6416 Change-Id: I4c78e9de80988efd2380957c9974b7f43608c0e2
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
am: 92c16a1393 -s ours Change-Id: I46643853ff82dd7fd90d463a9015f68b9d8e7d1b
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: 216f973f1d -s oursXin Li
am: 2ca42b2d88 Change-Id: Ib37f059def2dab5519a0840024931a2c055eb4f9
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: 216f973f1d -s ours Change-Id: If81c6414d650b05f5601182f77bc3b4f7bef7f6f
2017-12-06Remove the workaround for Eigen sigmoid_opMiao Wang
Test: mm Change-Id: I595f302a591e0f1fb8cd3549926ea29e8e446401
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: Ib47a263fd256516f70cdcdb5e984b8e3afcd9cfe
2017-10-18Snap for 4402171 from 115b9d5f1dec1658687e426bdd8f68bdca79ed11 to pi-releaseandroid-build-team Robot
Change-Id: I9ad599de0c2489cfd94e88c207707ff40de8a509
2017-10-17Merge "Mark libF77blas as vendor_available" am: 3ccf694ab4 am: 3a6f837d1e ↵Jae Shin
am: 583a1c1759 -s ours am: a7cab23f0b -s ours Change-Id: Ia11e9d18517a925324122398006f029a7081a00f
2017-10-17Merge "Mark libF77blas as vendor_available" am: 3ccf694ab4 am: 3a6f837d1eJae Shin
am: 583a1c1759 -s ours Change-Id: I0328501e34ad54b5458c0ea3d53672ea47d18717
2017-10-17Merge "Mark libF77blas as vendor_available" am: 3ccf694ab4Jae Shin
am: 3a6f837d1e Change-Id: I966778065d92727d7afb154cbf4ee6151abd43da
2017-10-17Merge "Mark libF77blas as vendor_available"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Jae Shin
am: 3ccf694ab4 Change-Id: I990cb86b9d0b4ea3aa17c6e50dddf5e4daa3c552
2017-10-17Merge "Mark libF77blas as vendor_available"Jae Shin
2017-10-16Mark libF77blas as vendor_availableJiyong Park
This is required by libblas, which is a vndk-sp library. Since this is a static library, vendor_available: true is enough. Bug: 64425518 Bug: 64395154 Test: BOARD_VNDK_VERSION=current m -j libblas.vendor Merged-In: I496a1f150719c15ac1c50508ebf9a097c5630347 Change-Id: I496a1f150719c15ac1c50508ebf9a097c5630347 (cherry picked from commit aaa7c2fb4f9100b5c802049f4626e6bc500b5219)
2017-09-29release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367 ↵android-build-team Robot
572 snap-temp-L13500000107248413 Change-Id: I7da5fab8c27c86533679a89ad323b150727f3b70
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 21:59:09 +0000