Commit Graph

1161 Commits

Author SHA1 Message Date
Jiakai Zhang
d09969fae8 Merge "Add new allowed dependency "libc++fs"." am: bbafb74821 am: bedf78ed6b am: cae409bc56
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1891375

Change-Id: I092af971418fd910417ebd475cba497013dce429
2021-11-17 11:30:26 +00:00
Jiakai Zhang
cae409bc56 Merge "Add new allowed dependency "libc++fs"." am: bbafb74821 am: bedf78ed6b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1891375

Change-Id: Ie6c6ec858480586fb1b8d43f721be10f8540d464
2021-11-17 11:18:54 +00:00
Jiakai Zhang
bedf78ed6b Merge "Add new allowed dependency "libc++fs"." am: bbafb74821
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1891375

Change-Id: I0ed72b81c5bbba2eec51dc770261b662d77519b2
2021-11-17 10:57:11 +00:00
Jiakai Zhang
bbafb74821 Merge "Add new allowed dependency "libc++fs"." 2021-11-17 10:39:48 +00:00
TreeHugger Robot
06eb736a46 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 4e4dbfdc31 -s ours am: b33d824f13 -s ours
am skip reason: Merged-In Ic89b2756619b736bc98d3384d665e2e7cecc0110 with SHA-1 d1dee1dd8a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/16279016

Change-Id: I626d28da755df569b3f2e606b3bc92ab6e3fdffa
2021-11-17 10:08:33 +00:00
TreeHugger Robot
b33d824f13 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 4e4dbfdc31 -s ours
am skip reason: Merged-In Ic89b2756619b736bc98d3384d665e2e7cecc0110 with SHA-1 d1dee1dd8a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/16279016

Change-Id: I492c81922fb10fd09915342c23d0267241d1b954
2021-11-17 09:43:46 +00:00
TreeHugger Robot
4e4dbfdc31 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-17 09:26:57 +00:00
Xiao Ma
1adb1e40fa Add networkstack-aidl-interfaces-V13 to allowed_deps.
Apex-Size-Increase: negligible
Just replace networkstack-aidl-interfaces-V12 with V13 which has one
more callback api in IIpClientCallbacks and a stable parcelable.

Previous-Platform-Support: Yes, support previous platform releases

Aosp-First: Yes

Test-Info: all unit tests and integration tests related to NetworkStack

Bug: 204723906
Test: m
Change-Id: I22ae460feeec160cb8598232ca3c603d08e19b52
2021-11-17 07:46:41 +00:00
satayev
4fa1920731 Merge "Change min max sdk version type to string." am: bc58c17620 am: 1b8e11673c am: eb262ff04b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885513

Change-Id: Ie7a2a2d40891204f3fc54ac1e010098c9a495ad9
2021-11-15 22:18:23 +00:00
satayev
eb262ff04b Merge "Change min max sdk version type to string." am: bc58c17620 am: 1b8e11673c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885513

Change-Id: Icc3a1ca6d66179e2eb76b411de9e766de1134718
2021-11-15 22:07:19 +00:00
satayev
1b8e11673c Merge "Change min max sdk version type to string." am: bc58c17620
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885513

Change-Id: I3723f80e81562a5f8aa1d94f3350199060b81001
2021-11-15 21:53:35 +00:00
satayev
bc58c17620 Merge "Change min max sdk version type to string." 2021-11-15 21:41:03 +00:00
Jiakai Zhang
2e20043b65 Add new allowed dependency "libc++fs".
Bug: 205276874
Test: m nothing
Apex-Size-Increase: 40KB (or 0.1% of the ART APEX)
Previous-Platform-Support: yes (The library is statically linked.)
Aosp-First: yes
Test-Info: See above
Change-Id: I46d086079c0b0fa83455f898fb7328b94c761fb4
2021-11-12 21:19:04 +00:00
Martin Stjernholm
36c9221210 Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" am: 7a23a009f6 am: 6b11ad21eb am: f92c0a1eb2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1884792

Change-Id: I74ee9d4bc88a0e6b5e7a43db239938b4d7c6b61f
2021-11-12 13:15:52 +00:00
Martin Stjernholm
f92c0a1eb2 Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" am: 7a23a009f6 am: 6b11ad21eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1884792

Change-Id: Icaab56c86af5ceca744589eba19551d8e5f0b969
2021-11-12 13:05:15 +00:00
Martin Stjernholm
6b11ad21eb Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" am: 7a23a009f6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1884792

Change-Id: I831c8bba377ace6caa196c9ba3d2ea16b46c987d
2021-11-12 12:54:26 +00:00
Martin Stjernholm
7a23a009f6 Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" 2021-11-12 12:32:14 +00:00
Bob Badour
04908de88a [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: de258df0ae am: b33681347a am: e6bc3dab20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1889597

Change-Id: I8d85c0dad80124a48c632ae12e1c578ee7133e51
2021-11-12 00:30:17 +00:00
Bob Badour
e6bc3dab20 [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: de258df0ae am: b33681347a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1889597

Change-Id: I0d046db6dbf38445cf67d2237a87c7e1d83bfdbf
2021-11-12 00:14:15 +00:00
Bob Badour
b33681347a [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: de258df0ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1889597

Change-Id: I7ba8f8c585dedb7162662e0748b6adf78f83284e
2021-11-11 23:57:38 +00:00
Bob Badour
de258df0ae [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common
Added SPDX-license-identifier-Apache-2.0 to:
  build/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I6ee34b2b64c60bc33d9a8169b956a49ad97099e1
2021-11-11 10:36:43 -08:00
Treehugger Robot
57f19a0c2c Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3 am: 7ade263d19 am: 3f827835ad am: 138cc63a13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063

Change-Id: I9d05edfd6028d309e419e943cd6677c8f61d743c
2021-11-11 14:58:04 +00:00
Treehugger Robot
138cc63a13 Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3 am: 7ade263d19 am: 3f827835ad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063

Change-Id: I3fdfbce0209f4a9dbfadddc211001afdd309c256
2021-11-11 14:44:40 +00:00
Treehugger Robot
3f827835ad Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3 am: 7ade263d19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063

Change-Id: Ie9cd598560fcd4a1d3b80d8bef2461e7297e53d2
2021-11-11 14:32:42 +00:00
Maciej Żenczykowski
a0aa326a97 Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" am: b69169da75 am: 5bdf2de8e4 am: 3577f45e12 am: b853116320
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885710

Change-Id: I6bfae7d684ca5e7fedaac71786ec429c79dfe15a
2021-11-11 14:31:18 +00:00
Maciej Żenczykowski
b853116320 Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" am: b69169da75 am: 5bdf2de8e4 am: 3577f45e12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885710

Change-Id: Ib94c1561b92a52da6fb2ddb4adea25373d4da23f
2021-11-11 14:19:27 +00:00
Treehugger Robot
7ade263d19 Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063

Change-Id: I3d7880865b5fc879936eca2a14c45dfc1231e3ad
2021-11-11 14:14:46 +00:00
Maciej Żenczykowski
3577f45e12 Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" am: b69169da75 am: 5bdf2de8e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885710

Change-Id: I316b8f07ad1947a58e5776329c1d633a6617fc73
2021-11-11 14:02:34 +00:00
Treehugger Robot
0305f80cb3 Merge "Migrate NetworkStack modules to use modules-utils" 2021-11-11 13:56:26 +00:00
Maciej Żenczykowski
5bdf2de8e4 Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" am: b69169da75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885710

Change-Id: Id09174058cf84da2b2343af40bbae34551a7b860
2021-11-11 13:42:39 +00:00
Maciej Żenczykowski
b69169da75 Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" 2021-11-11 13:19:48 +00:00
markchien
8d8574bec4 Add net-utils-device-common-bpfjni to allow_deps.txt
libbpfmapjni is renamed to libnet_utils_device_common_bpf

Apex-Size-Increase: -8192B
before:
-rw-r----- 1 markchien primarygroup 2887680 Nov 10 12:18 out/target/product/vsoc_x86_64/system/apex/com.android.tethering.apex
after:
-rw-r----- 1 markchien primarygroup 2879488 Nov 10 12:25 out/target/product/vsoc_x86_64/system/apex/com.android.tethering.apex

Previous-Platform-Support:
There is no behavior change for the module. The new dependencies
net-utils-device-common-bpf is separated from
net-utils-device-common-netlink which is also used by tethering module.

Aosp-First: yes

Test-Info: there is no behavior change for tethering module.
Existing TetheringPrivilegedTests could cover the test.

Bug: 179733303
Test: TH
Change-Id: Ia918ebe42a82320b5bed285278fe2f70c4f9f7df
2021-11-11 10:47:08 +00:00
Martin Stjernholm
79c9eff868 Revert "Add back symbolic "S" versions for the ART exported libs."
This reverts commit 4322d30248.

Reason for revert: Should no longer be necessary after http://ag/16222109

Change-Id: I09ebfaeaf5dbfff99ae821c65df6352c16736fbc
2021-11-10 15:40:10 +00:00
Martin Stjernholm
6e09e0b503 Add back symbolic "S" versions for the ART exported libs. am: 4322d30248 am: 97a18021f7 am: 5d9c4db981 am: 9b6de5a227
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885516

Change-Id: Ie5462293ab0f136e0385c0667288bb29323a1894
2021-11-10 13:40:00 +00:00
Martin Stjernholm
9b6de5a227 Add back symbolic "S" versions for the ART exported libs. am: 4322d30248 am: 97a18021f7 am: 5d9c4db981
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885516

Change-Id: I1ab6a38986627b2d2370a699583940d778ecadc3
2021-11-10 13:22:59 +00:00
Martin Stjernholm
5d9c4db981 Add back symbolic "S" versions for the ART exported libs. am: 4322d30248 am: 97a18021f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885516

Change-Id: Icc2e1dc12d0cbced3a3e00057b84f06bc4d63956
2021-11-10 13:04:49 +00:00
Martin Stjernholm
97a18021f7 Add back symbolic "S" versions for the ART exported libs. am: 4322d30248
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885516

Change-Id: Id7be3894a09b1b0bb318b3afe8ecd93afa1ef98f
2021-11-10 12:53:44 +00:00
Martin Stjernholm
4322d30248 Add back symbolic "S" versions for the ART exported libs.
They were removed in https://r.android.com/1876200 but are still
required in sc-mainline-prod because ART (and
https://r.android.com/1875690 specifically) doesn't merge in there.

Test: vendor/google/build/mainline_modules_sdks.sh
  on sc-mainline-prod
Bug: 205748626
Bug: 204364566
Change-Id: I9a987a3f52a173746f0d21acfdd0074f166dc53d
2021-11-10 11:13:15 +00:00
Treehugger Robot
e84cc834b0 Merge "Change ExoPlayer library name" am: ecf5c0b3bd am: 8c61057f51 am: 55f103d4c5 am: 8dfbcf2aeb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885409

Change-Id: I9125d6502b69650d910a8836b973550e50c4b256
2021-11-10 11:04:09 +00:00
Treehugger Robot
8dfbcf2aeb Merge "Change ExoPlayer library name" am: ecf5c0b3bd am: 8c61057f51 am: 55f103d4c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885409

Change-Id: Iffa12c4822a9ec487997f0e6ad4c7f05744e3356
2021-11-10 10:51:50 +00:00
Treehugger Robot
55f103d4c5 Merge "Change ExoPlayer library name" am: ecf5c0b3bd am: 8c61057f51
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885409

Change-Id: Ic09d76c7a4f195da77bd52cdd1546f1f8c2379e1
2021-11-10 10:34:33 +00:00
Treehugger Robot
8c61057f51 Merge "Change ExoPlayer library name" am: ecf5c0b3bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885409

Change-Id: Ia459f1bce945d8fc856555096f6d69a1a2a8d665
2021-11-10 10:17:08 +00:00
Treehugger Robot
ecf5c0b3bd Merge "Change ExoPlayer library name" 2021-11-10 10:00:56 +00:00
Sahana Rao
73a52695e2 Change ExoPlayer library name
Change from exoplayer2.15.1-core to exoplayer2.15.1

Bug: 204975779
Test: Build

Change-Id: Id9810894ddc4a65f66268c54d9cb073098cda667
2021-11-10 09:59:39 +00:00
Xin Li
c8f2598844 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: Ic89b2756619b736bc98d3384d665e2e7cecc0110
Change-Id: I26acc4fc0016398430d88ae88a6c1afbbe8c4131
2021-11-10 08:06:29 +00:00
Martin Stjernholm
d2b980846a Merge "Switching ART libs to set min_sdk_version by number." am: 46dc3d270b am: d3698c17c5 am: 7a5429b1d9 am: 8e1a7a2e76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876200

Change-Id: I271e2c6ca6db833dea71c8c457be8060c2ce4698
2021-11-09 21:14:58 +00:00
Martin Stjernholm
8e1a7a2e76 Merge "Switching ART libs to set min_sdk_version by number." am: 46dc3d270b am: d3698c17c5 am: 7a5429b1d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876200

Change-Id: Idc71d29c94fe08aecae594dfdcce0eb402057c06
2021-11-09 20:49:13 +00:00
Martin Stjernholm
7a5429b1d9 Merge "Switching ART libs to set min_sdk_version by number." am: 46dc3d270b am: d3698c17c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876200

Change-Id: I03079c77490b8a2f1a7698eb4639a84af9402547
2021-11-09 20:19:51 +00:00
Martin Stjernholm
d3698c17c5 Merge "Switching ART libs to set min_sdk_version by number." am: 46dc3d270b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876200

Change-Id: Idb43902dfc7b9e816681a5bf2ef6b9d9e2d6f437
2021-11-09 19:45:47 +00:00
Martin Stjernholm
46dc3d270b Merge "Switching ART libs to set min_sdk_version by number." 2021-11-09 19:28:19 +00:00