diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-17 22:30:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-17 22:30:03 +0000 |
commit | 65a8683b07ce5587dd2e3c9d0cdb40c40e6f7687 (patch) | |
tree | c3f5bbb44c1db5edd68bb4db506435012b92eeff | |
parent | ef0179173c2ae17fdb295d9f4d656ecc74a6e07b (diff) | |
parent | 74d7ed130824eeee57fcd063db414275b1b4b35d (diff) | |
download | libnl-65a8683b07ce5587dd2e3c9d0cdb40c40e6f7687.tar.gz |
Merge "Add more APIs for managing VLANs" am: 5e126df972 am: 65fcb0418e am: 74d7ed1308android-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341810000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341811030aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseaml_rkp_341810000aml_hef_341811030
Original change: https://android-review.googlesource.com/c/platform/external/libnl/+/2365853
Change-Id: Ia80cffaf5ba4869fb49b09c40f9efc25f8f9c0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -73,6 +73,12 @@ cc_library { "lib/route/link/api.c", "lib/route/link/macsec.c", "lib/route/link/sriov.c", + "lib/route/link/vlan.c", + "lib/route/nexthop.c", + "lib/route/nexthop_encap.c", + "lib/route/nh_encap_mpls.c", + "lib/route/route.c", + "lib/route/route_obj.c", "lib/route/route_utils.c", "lib/route/rtnl.c", ], |