summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-28Snap for 6439596 from 7c5d43915046b2d1af8930ae772c291ea28baac3 to ↵q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-releaseandroid-build-team Robot
qt-aml-tzdata-release Change-Id: Ica396cc999073ef47f55828d350b4dbf1f787942
2019-11-11Snap for 6001391 from e5187d1a68aba33f78b582056f82012f6a9038d3 to ↵android-build-team Robot
qt-aml-tzdata-release Change-Id: Id45177c50004badb2901939e7003ee3dcb1c9f05
2019-11-02Fix apf_run disassembler output. am: cdb38a5e3eLorenzo Colitti
am: 1f847f05d8 Change-Id: I00c4097fd4df98d95263ba6141dc2f819172b69e
2019-11-02Fix apf_run disassembler output.Lorenzo Colitti
am: cdb38a5e3e Change-Id: Id6afb62561ed5fb8cca7fc01ed78e4e8140b14ac
2019-11-02Fix apf_run disassembler output.Lorenzo Colitti
The change to print disassembled code in apf_run (aosp/1129074) broke the output of apf_run by printing PC, R0, PC instead of R0, R1, PC. This was noticed because compiling the code with -O0 (which happened when I put apf_run.c into a test target) results in a compiler error. Unfortunately the error goes away with the default compiler settings and -Werror=format-extra-args does not help. Test: existing tests were incorrect, modified Change-Id: Iad1713ce253b5df62ad5cd42b6ddff28559dda8c
2019-10-19Add TEST_MAPPING for the APF low-level code. am: 74ede83c56 am: fed006431bLorenzo Colitti
am: 33a1edf8ec Change-Id: I0b08c923425a1a809dec79d47e7ee82863193708
2019-10-19Add TEST_MAPPING for the APF low-level code. am: 74ede83c56Lorenzo Colitti
am: fed006431b Change-Id: Ifca1a1f8f95f83a02128f500c122332ac5eda551
2019-10-19Add TEST_MAPPING for the APF low-level code.Lorenzo Colitti
am: 74ede83c56 Change-Id: Ic3962d1c8bad5f233c983e1718ba72a9ff454e38
2019-10-16Add TEST_MAPPING for the APF low-level code.Lorenzo Colitti
Currently, this will run NetworkStackTests (which run the interpreter) and apf_run_test (which runs the disassembler). Also disable apf_run_test on Windows because it's a shell script that relies on bash. Bug: 66928272 Test: treehugger Change-Id: I0773887604a2c41e63e4c6c629ad81c3e6143bcc
2019-10-15Add some tests for apf_run. am: 26dafcd858 am: 37e5280ee8Lorenzo Colitti
am: ad57e39f07 Change-Id: Ic83594bf763945c0f0f616bc9c0acb83605fc87a
2019-10-15Print disassembled code in apf_run. am: 983eb51423 am: da6a0ef335Lorenzo Colitti
am: 18ce213d82 Change-Id: If1e9925d21ba40e674164f67cc4dfd1058e3d26f
2019-10-15Add some tests for apf_run. am: 26dafcd858Lorenzo Colitti
am: 37e5280ee8 Change-Id: I8f538f1b2534056b8507a70913c1652bc468e5c0
2019-10-15Print disassembled code in apf_run. am: 983eb51423Lorenzo Colitti
am: da6a0ef335 Change-Id: Idab03998dda6a8f99889d6a6892eba825a931862
2019-10-15Add some tests for apf_run.Lorenzo Colitti
am: 26dafcd858 Change-Id: Ib28de45a785965e930b92362b5b22a454a01f9b5
2019-10-15Print disassembled code in apf_run.Lorenzo Colitti
am: 983eb51423 Change-Id: I43418a911de2c0c0bf0f2ca56720aba3b974127e
2019-10-14Add some tests for apf_run.Lorenzo Colitti
These tests cover both apf_run itself and the disassembler (and of course the interpreter). Test: atest apf_run_test Change-Id: I622bb2bbd0ec48bdddb511963c374651705ff545
2019-10-14Print disassembled code in apf_run.Lorenzo Colitti
apf_run is a great tool to debug APF programs, but it does not currently print disassemled code. Fix this. Before: PC: 0 R0: 0 R1: 0 PC: 2 R0: 86dd R1: 0 PC: 7 R0: 86dd R1: 0 PC: 64 R0: 86dd R1: 0 PC: 141 R0: 86dd R1: 0 After: R0 R1 PC Instruction ------------------------------------------------- 0 0 0: ldh r0, [12] 2 86dd 2: jlt r0, 0x600, drop 7 86dd 7: jne r0, 0x806, 64 40 86dd 64: jne r0, 0x800, 141 8d 86dd 141: jeq r0, 0x86dd, 161 ... Bug: 66928272 Test: manually compared output on a sample program Change-Id: I1b93f70e0381d6e43d7f7d9785ab8c935baa1e4b
2019-10-08Enable stricter compiler warnings am: 90cde57df6 am: f8f0959556Bernie Innocenti
am: 28176c5731 Change-Id: Ie7d5c581c4f9dab5750bb35f487fbce7c96b9e30
2019-10-08Enable stricter compiler warnings am: 90cde57df6Bernie Innocenti
am: f8f0959556 Change-Id: I184e4a24c19ec7d3cfdc604899549c87305db471
2019-10-08Enable stricter compiler warningsBernie Innocenti
am: 90cde57df6 Change-Id: Ia4e4f9ccd4e482dfe74c4292c628a4470ad3a6c5
2019-10-08Enable stricter compiler warningsndk-sysroot-r21Bernie Innocenti
Test: m apf_run apf_disassembler libapf Change-Id: I43b975a6afa11f693268317de69967e7774a1c85
2019-03-08Revert "Enable the clang-format hook for hardware/google/apf" am: 6f73fbb3a0 ↵android-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-releaseBernie Innocenti
am: 3ae28a202f am: b8a466afd4 Change-Id: Ie06a6071c83e0596a3d130053a0c3d9c8be017d8
2019-03-08Revert "Enable the clang-format hook for hardware/google/apf" am: 6f73fbb3a0Bernie Innocenti
am: 3ae28a202f Change-Id: I7ac3ecc4b254f56fa98962f4c09b8f7c33b414a5
2019-03-08Revert "Enable the clang-format hook for hardware/google/apf"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Bernie Innocenti
am: 6f73fbb3a0 Change-Id: Ib577d2959588e0e1cd6301fcf129d3347c1f3f6f
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: ee8232b1c0 Change-Id: I7bd1d151e9791c09ad2e77986b64f246823778e7
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I9ad60eb896816eb533b0c364d3cb34b23aee28e5
2019-02-22Revert "Enable the clang-format hook for hardware/google/apf"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseBernie Innocenti
This reverts commit 2af4ba42b5e3e9e16765979d169c7c6fe49e603d. Reason for revert: APF uses a mix of 2-space and 4-space indentation, and clang-format doesn't support this. Re-indenting the entire codebase would interferes with 'git blame' and cause annoying merge conflicts. Change-Id: If77e4e2f189549cfd0635b52a32c89f14b8f99cf
2019-02-21Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into ↵Xin Li
stage-aosp-master
2019-02-20Enable the clang-format hook for hardware/google/apf am: 2af4ba42b5 am: ↵Bernie Innocenti
39492ba12d am: 98acc3d25c Change-Id: Iea9148ec580b54b28736d2ac7583caa90e122252
2019-02-20Enable the clang-format hook for hardware/google/apf am: 2af4ba42b5Bernie Innocenti
am: 39492ba12d Change-Id: I03bde339794a63f5625687381fbbf2d01d32ade7
2019-02-20Enable the clang-format hook for hardware/google/apfBernie Innocenti
am: 2af4ba42b5 Change-Id: I62ba263cd1c12ed1ae678c361c4086175f30f2b6
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I5c91808a99e0412fd00de3b2a6ab0428417abd97
2019-02-14Enable the clang-format hook for hardware/google/apfBernie Innocenti
Change-Id: Ia98bf4f7e030541e1062effb8ba2ab8fd6e6050e
2019-02-12Add basic execution tracing support to apf_run am: d0174a67d8 am: adf9750f28Bernie Innocenti
am: 87a315aff4 Change-Id: I1a7f254bf42a8b4939fbbf39e946cf862f1bccc4
2019-02-12Add basic execution tracing support to apf_run am: d0174a67d8Bernie Innocenti
am: adf9750f28 Change-Id: I898b468a2ed6bde1c8546bd74d7f091de01fc606
2019-02-12Add basic execution tracing support to apf_runBernie Innocenti
am: d0174a67d8 Change-Id: I2e879d7f42469f98efaa7ba6aadb63fa8ddef268
2019-02-12Add basic execution tracing support to apf_runBernie Innocenti
This adds a --trace option to apf_run which dumps the PC and register content during execution. This is a big aid in debugging misbehaving APF programs. It should be easy to disassemble the current instruction inline if we refactor apf_disassembler to extract its body to a separate function. Another easy feature would be dumping the memory locations that were modified by the previous instruction. Test: apf_run --trace --program <program> --packet <packet> --data <data> Change-Id: I2a24bdfb84ce4e86409542332ee32082988a7698
2019-02-05Consolidate OWNERS to platform/system/netd:/OWNERS am: 5698836c72 am: 49b916a860Bernie Innocenti
am: 71413c43c6 Change-Id: I1e500c6de4b07508041b70de924d13fe9b7bfeeb
2019-02-05Consolidate OWNERS to platform/system/netd:/OWNERS am: 5698836c72Bernie Innocenti
am: 49b916a860 Change-Id: Idb29fb501066048ead2e378969de2bc19edba7e3
2019-02-05Consolidate OWNERS to platform/system/netd:/OWNERSBernie Innocenti
am: 5698836c72 Change-Id: I3ca8d27fd11721660bae27698367106d6488b86f
2019-02-06Consolidate OWNERS to platform/system/netd:/OWNERSBernie Innocenti
Test: build/make/tools/checkowners.py hardware/google/apf/OWNERS Change-Id: Ie6c815257523666740d0c648761083b357dd4cac
2018-12-10Disable apf_run on darwin am: b7af00686b am: 30f80adf19Aaron Huang
am: f03e5d7819 Change-Id: Ie33ffe7d1a8f57c7d8c4cf0f1383a889e2748fb9
2018-12-09Disable apf_run on darwin am: b7af00686bAaron Huang
am: 30f80adf19 Change-Id: I4fd77f33d97ed63925e06467255a099e120281d2
2018-12-09Disable apf_run on darwinAaron Huang
am: b7af00686b Change-Id: I79587649dd8cd9b2f9ed999e2abb9b2d76c29431
2018-12-10Disable apf_run on darwinandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Aaron Huang
Fix build break since libpcap did not enable for darwin Test: tried disable on linux and change target to darwin Change-Id: Iadc463cfa96190cbc8e44f084fb81e8a71050d18
2018-12-09Make apf_run support reading a pcap file am: 5ef76bdf49 am: fa912162e9Aaron Huang
am: 23d87f3407 Change-Id: I289adaefcb03913abfadfcab0a4d980c7d6cec81
2018-12-09Make apf_run support reading a pcap file am: 5ef76bdf49Aaron Huang
am: fa912162e9 Change-Id: Ic0bd4b458888f4f4d871795a08924e8ad70fed2a
2018-12-09Make apf_run support reading a pcap fileAaron Huang
am: 5ef76bdf49 Change-Id: Id3ea967990f2efdafa1d3816bfe5fe22e8be1b8f
2018-12-05Make apf_run support reading a pcap fileAaron Huang
To read a pcap file and run the packets through APF program. Bug: 114458629 Test: make apf_run works Change-Id: I7e5dddf3092d787f6191e4a51afb165cd9dd71c4
2018-11-01Convert to Android.bp am: 4810da91a8 am: 6e7165dc37Dan Willemsen
am: f909992a6a Change-Id: Ia3d7f1719e3af2600cbb3be37be24c77422bf062