summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 70d320a775 -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: bc3d13599b -s ours am skip reason: Change-Id I92c2d0d9ba62a77057ef9a0006400361fa876358 with SHA-1 e2ac0ed26d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a944160dce9c76b60a07cb6a7031ae8f3eb9d22
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/apf am: a5c61cc602 am: ↵Bob Badour
aee42cded0 am: adb65b030a Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1588376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id03c95661a1d3523974259b91e2316f7db1b56e9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 70d320a775 -s oursXin Li
am skip reason: Change-Id I92c2d0d9ba62a77057ef9a0006400361fa876358 with SHA-1 e2ac0ed26d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a15a22d0e4ccd188dd343c6208f95f324fb219a
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I92c2d0d9ba62a77057ef9a0006400361fa876358 Change-Id: I618ad63befe6b0de61773aca4e78f95c1f7f4a31
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/apf am: a5c61cc602 am: ↵Bob Badour
aee42cded0 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1588376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6db62749c21c133a1c64b61930db56a2d1581edc
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/apf am: a5c61cc602Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1588376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9535538d6e25b8dc83513696999483caf2a64888
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/apfBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1b5e37887a6f0a87a2bba1483330ba14f81b89c8
2020-11-25Mark ab/6881855 as merged am: 72ad8f8bc7 am: e2ac0ed26dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/13112950 Change-Id: I6189d9e2aa6ccfc652bb93f91813ba74cb15d2ac
2020-11-25Mark ab/6881855 as merged am: 72ad8f8bc7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/13112950 Change-Id: I92c2d0d9ba62a77057ef9a0006400361fa876358
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I0959f6a387c521ddb854b6b9f72f3900b3e97f88
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: 6a36be0ac8 -s ours am: ↵Xin Li
fc565b00bb -s ours am: 2e42f71073 -s ours am skip reason: Change-Id Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6 with SHA-1 ce58ba53c1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12797265 Change-Id: I2bb88a3bfb714692480c8f01cd307217312d1326
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6a36be0ac8 -s ours am: ↵Xin Li
fc565b00bb -s ours am skip reason: Change-Id Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6 with SHA-1 ce58ba53c1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12797265 Change-Id: I813e63d20ee1c70eb9846af60a5ea0d9065bf1fe
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6a36be0ac8 -s oursXin Li
am skip reason: Change-Id Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6 with SHA-1 ce58ba53c1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12797265 Change-Id: I12d77f1db683882d8e7e96dff18fabbc14ecf147
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6 Change-Id: Ia4fd409c31e586de46aef49cfb3e18214eca2d48
2020-08-27[automerger skipped] Merge "Mark Android R ↵TreeHugger Robot
(rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: d2266c9c77 -s ours am: e7f02e0a4f -s ours am: 32d5574001 -s ours am: 38808c4655 -s ours am skip reason: Change-Id Ia6e28f8962f749aae115cc04b4dc085065813960 with SHA-1 bbdcaffd33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12469963 Change-Id: Ib39dc8b55be89e67f4f1260421bd7564ccece111
2020-08-27Merge "Add apf_run_test to presubmit." am: a28423a058 am: a8c045e1d3 am: ↵Treehugger Robot
7fb80bdd5a am: 083875ed15 am: c039ca53b4 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407988 Change-Id: Ib2858e0e2c52cbc7e268c3f9de870c1d3e2ff7bb
2020-08-27[automerger skipped] Merge "Mark Android R ↵TreeHugger Robot
(rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: d2266c9c77 -s ours am: e7f02e0a4f -s ours am: 32d5574001 -s ours am skip reason: Change-Id Ia6e28f8962f749aae115cc04b4dc085065813960 with SHA-1 bbdcaffd33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12469963 Change-Id: I723d76b90137445860b3e58d86acd071af75035a
2020-08-27Merge "Add apf_run_test to presubmit." am: a28423a058 am: a8c045e1d3 am: ↵Treehugger Robot
7fb80bdd5a am: 083875ed15 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407988 Change-Id: Ia24acc4ef79cda362a29c90b8f6f47d7c031f68e
2020-08-27[automerger skipped] Merge "Mark Android R ↵TreeHugger Robot
(rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: d2266c9c77 -s ours am: e7f02e0a4f -s ours am skip reason: Change-Id Ia6e28f8962f749aae115cc04b4dc085065813960 with SHA-1 bbdcaffd33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12469963 Change-Id: I1da246b290a9ddd8219aff0d284b7cbd6afdbaf4
2020-08-27Merge "Add apf_run_test to presubmit." am: a28423a058 am: a8c045e1d3 am: ↵Treehugger Robot
7fb80bdd5a Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407988 Change-Id: I56b2bb46cdf761859fc0160fa654189464b286c9
2020-08-27[automerger skipped] Merge "Mark Android R ↵TreeHugger Robot
(rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: d2266c9c77 -s ours am skip reason: Change-Id Ia6e28f8962f749aae115cc04b4dc085065813960 with SHA-1 bbdcaffd33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12469963 Change-Id: I4af654ecb526ef97d9a5f6a1b828addc78ee1eb7
2020-08-27Merge "Add apf_run_test to presubmit." am: a28423a058 am: a8c045e1d3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407988 Change-Id: I8dcd654bafa396cd66351c66c1a84afbba1c3234
2020-08-27Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" ↵TreeHugger Robot
into stage-aosp-master
2020-08-27Merge "Add apf_run_test to presubmit." am: a28423a058Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407988 Change-Id: Iae3a3182cf27530ba0d0876f8ec870d3cd84c74c
2020-08-27Merge "Add apf_run_test to presubmit."Treehugger Robot
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Ia6e28f8962f749aae115cc04b4dc085065813960 Change-Id: I0e8a263e4189e06441b4015d9e0555f6bbf40bd4
2020-08-25Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3 ↵Treehugger Robot
am: c354d56eea am: bc0428eb08 am: 4ce42a7962 am: a4cfb2e79f Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987 Change-Id: I294ab11362cbd7f85ee9558585f4c50303f781e9
2020-08-25Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3 ↵Treehugger Robot
am: c354d56eea am: bc0428eb08 am: 4ce42a7962 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987 Change-Id: Ibbea000b696ad4a223071320b07ec90067ae32ab
2020-08-25Add apf_run_test to presubmit.Lorenzo Colitti
This test is finally green. Bug: 143248826 Test: treehugger Change-Id: Ic9fe207390e0835469ec39c6bac1a29b9b95fa32
2020-08-25Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3 ↵Treehugger Robot
am: c354d56eea am: bc0428eb08 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987 Change-Id: I86209d038e947270bd9e155d4ebe228584091858
2020-08-25Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3 ↵Treehugger Robot
am: c354d56eea Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987 Change-Id: I9049840c9ea3686fe68bd4eb86ebaa712eadcc4e
2020-08-24Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987 Change-Id: Ia171fefee3830765a524bc94df43eb6308c693c7
2020-08-24Merge "Add data_bins to apf_run_test so it can run remotely."Treehugger Robot
2020-08-24Add data_bins to apf_run_test so it can run remotely.Lorenzo Colitti
Currently it's possible to run apf_run_test locally, but not remotely, because the required binary (apf_run) is not packaged when the test is built. Fix this using the new data_bins property, and remove the useless requires: which was an attempt to fix this problem. Make the test shell script invoke apf_run with "./" because the binary is in the same directory as the test (it used to work when running locally because it was in a directory that was in $PATH). Also annotate the test with a null-device property, since it does not require a device. This does not seem to work with atest but hopefully it does work when running remotely. Bug: 143248826 Test: atest apf_run_test Test: forrest run L17500000674511176 Change-Id: Ifec451c5ab4f4c96ad91a9a64157d88800e443e2
2020-07-08Add test coverage for the --age parameter to apf_run. am: 82f4e345ae am: ↵Lorenzo Colitti
ac34a46fa7 am: bbdcaffd33 am: ce58ba53c1 am: 7805a4ee04 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358484 Change-Id: I4643cb803f0955f3d1ecc05c8ed6a7efae88c1aa
2020-07-08Remove useless limitation on argc. am: 164a8c4e4e am: d94069bac1 am: ↵Lorenzo Colitti
1d58ce2eeb am: 4dab916508 am: 3bf223810f Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358482 Change-Id: Ifda0d4ab87288b921584157bcb15b75714382de7
2020-07-08Add test coverage for the --age parameter to apf_run. am: 82f4e345ae am: ↵Lorenzo Colitti
ac34a46fa7 am: bbdcaffd33 am: ce58ba53c1 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358484 Change-Id: Id1e39eab19d832dd1e240d37993687eee2204261
2020-07-08Remove useless limitation on argc. am: 164a8c4e4e am: d94069bac1 am: ↵Lorenzo Colitti
1d58ce2eeb am: 4dab916508 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358482 Change-Id: I74fbaefd1bd9f79c35353d1914d1894ecc241456
2020-07-08Add test coverage for the --age parameter to apf_run. am: 82f4e345ae am: ↵Lorenzo Colitti
ac34a46fa7 am: bbdcaffd33 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358484 Change-Id: Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6
2020-07-08Remove useless limitation on argc. am: 164a8c4e4e am: d94069bac1 am: 1d58ce2eebLorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358482 Change-Id: If77ea6b8ac39d4aac83485e64d99c45249c7b219
2020-07-08Add test coverage for the --age parameter to apf_run. am: 82f4e345ae am: ↵Lorenzo Colitti
ac34a46fa7 Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358484 Change-Id: Ia6e28f8962f749aae115cc04b4dc085065813960
2020-07-08Remove useless limitation on argc. am: 164a8c4e4e am: d94069bac1Lorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358482 Change-Id: If6c1820a0d459fa4cbaadcd05a54b793eb3c0eea
2020-07-08Add test coverage for the --age parameter to apf_run. am: 82f4e345aeLorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358484 Change-Id: Ibdc1bbf15ea6b8d4d83e4f468ff3f883b7aced12
2020-07-08Remove useless limitation on argc. am: 164a8c4e4eLorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1358482 Change-Id: Ic6667d1ec296fe689e9d601dc581375f253947d4
2020-07-08Add test coverage for the --age parameter to apf_run.android-r-beta-3android-r-beta-2Lorenzo Colitti
Currently this is untested, and, as it happened, didn't work when all the other parameters (program, packet, data, --trace) were specified. Currently each testcase is a set of 3 or 4 files with the same basename and with extensions .program, .packet, .output, and optionally .data. For simplicity, add another optional file with extension .age. Instead of recreating more testdata, re-use the existing testcase one_ra_with_counters, adding three more variants of it, one with age 30 (drop), one with age 600 (drop) and one with age 601 (pass). Avoid adding identical files by using symlinks for the program, packet and data files, and only define new files for the output and age files. Test: atest apf_run_test Change-Id: Idab8be57b1f98bd0246d9ec31695becce43c0d05
2020-07-08Remove useless limitation on argc.Lorenzo Colitti
The current code of apf_run limits the number of arguments to 8. This prevents passing in all of program, packet, data, and --trace, which is perhaps the most useful way to run the code. Simply remove the check. It's not useful, because the code already parses argv using getopt_long_only and rejects all invalid arguments. Test: apf_run --trace --program $PROGRAM --packet $PACKET --data $DATA --age $AGE Change-Id: I99fa47f275de9cfc8f66397555d6f4ea4a02ec75
2020-05-30Fix an incorrectly formatted required value. am: ed99f88d90 am: 4336dde019 ↵Jaewoong Jung
am: ae97ee170a am: e409e5aca9 am: 41df4f7f83 Change-Id: I4f282f6b6183da610fbdd1fbdea995f331c30d16
2020-05-29Fix an incorrectly formatted required value. am: ed99f88d90 am: 4336dde019 ↵Jaewoong Jung
am: ae97ee170a am: e409e5aca9 Change-Id: Ia4ba69204b5d95872a8d81329c640d3aaa971d45
2020-05-29Fix an incorrectly formatted required value. am: ed99f88d90 am: 4336dde019 ↵Jaewoong Jung
am: ae97ee170a Change-Id: I391c0939187d37578fd0ef7f26bc80c1c5c348d0
2020-05-29Fix an incorrectly formatted required value. am: ed99f88d90 am: 4336dde019Jaewoong Jung
Change-Id: I304d8381c0b820a86caa14858ff438e4ee7cf8f2