Commit Graph

1161 Commits

Author SHA1 Message Date
Ken Chen
cbb0238405 [NETD-BPF#31] Update allowed_deps.txt for bpf_map_utils
bpf_map_utils is referenced by libconn_for_netd in Tethering module.

Bug: 202086915
Test: see below

Apex-Size-Increase: 0. Adding a header file in cc_library_headers does
                    not increase apex size.
Previous-Platform-Support: Yes
Aosp-First: Yes
Test-Info: 1. m; flash; boot
           2. cd system/netd && atest
           3. cd packages/modules/Connectivity && atest
           4. atest FrameworksNetTests
Change-Id: Ie9281dce11593ac9072a4626afdb5fa3ebb48f34
2021-12-06 03:19:40 +00:00
Ken Chen
199438a980 Merge "[NETD-BPF#7] Update dependency for moving bpf_shared.h" am: 29cfb321e1 am: 73eba0b983 am: e735d42c5c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869325

Change-Id: I3d3df096537f0fec32509dbd935606ce6900b903
2021-12-03 09:50:46 +00:00
Ken Chen
e735d42c5c Merge "[NETD-BPF#7] Update dependency for moving bpf_shared.h" am: 29cfb321e1 am: 73eba0b983
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869325

Change-Id: Ibd4f6f648a094abeb41e13d859ba0d1a540b58bf
2021-12-03 09:33:48 +00:00
Ken Chen
73eba0b983 Merge "[NETD-BPF#7] Update dependency for moving bpf_shared.h" am: 29cfb321e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869325

Change-Id: I08755b6f3dbfdab1bdf1b3c05468ae5609585dc1
2021-12-03 09:20:00 +00:00
Ken Chen
29cfb321e1 Merge "[NETD-BPF#7] Update dependency for moving bpf_shared.h" 2021-12-03 08:15:06 +00:00
Xiao Ma
b415a5b3f8 Merge "Add networkstack-aidl-interfaces-V13 to allowed_deps." am: 3457d9dbb9 am: 69bf3c48bb am: 48db4b4b97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1894815

Change-Id: Ieb9adb3b1ef74359aa6bf03fa5c91fafd1e3f4ba
2021-12-03 02:10:56 +00:00
Xiao Ma
48db4b4b97 Merge "Add networkstack-aidl-interfaces-V13 to allowed_deps." am: 3457d9dbb9 am: 69bf3c48bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1894815

Change-Id: I42685811e2508a6a0b7b050f4b1f8e38c2fb4793
2021-12-03 02:00:39 +00:00
Xiao Ma
69bf3c48bb Merge "Add networkstack-aidl-interfaces-V13 to allowed_deps." am: 3457d9dbb9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1894815

Change-Id: I887e798f11983d53743eb0d8eb4827b5705989df
2021-12-03 01:46:17 +00:00
Xiao Ma
3457d9dbb9 Merge "Add networkstack-aidl-interfaces-V13 to allowed_deps." 2021-12-03 01:25:10 +00:00
Ken Chen
5bddbcfeb2 [NETD-BPF#7] Update dependency for moving bpf_shared.h
To mainline BPF code in Netd, the bpf_shared.h is from Netd to mainline
module. This commit is currently required because a user of bpf_shared.h
locates in platform. Once the caller is also moved to mainline, the
dependency can be removed.

Bug: 202086915
Test: see below
Apex-Size-Increase: 0. Adding a header file in cc_library_headers does
                    not increase apex size.
                    ($du -b out/.../com.google.android.tethering before
                    and after patch are the same.)
Previous-Platform-Support: Yes
Ignore-AOSP-First: merge conflict resolutions
Test-Info: 1. m; flash; boot
           2. cd system/netd && atest
           3. cd packages/modules/Connectivity && atest
           4. atest FrameworksNetTests
Merged-In: If4998deb102ee4a5a842b4afa53dccc7b428611d
Change-Id: If4998deb102ee4a5a842b4afa53dccc7b428611d
2021-12-02 23:24:34 +00:00
Jooyung Han
726a70cfc7 Set min_sdk_version (system/core) am: 08439e2b66 am: 9b93de599d am: cdf9e1d36c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900131

Change-Id: Ia435c9caa3198fd538b07191bd547383d86fcc6e
2021-12-02 03:41:43 +00:00
Jooyung Han
cdf9e1d36c Set min_sdk_version (system/core) am: 08439e2b66 am: 9b93de599d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900131

Change-Id: Ib3cf2919c4d1d0a3154f8dc72d29c2e58f3fc55f
2021-12-02 03:12:48 +00:00
Jooyung Han
9b93de599d Set min_sdk_version (system/core) am: 08439e2b66
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900131

Change-Id: Ib9bc3766fc691c6490463bb62a70da2af4cc8505
2021-12-02 02:49:52 +00:00
Jooyung Han
08439e2b66 Set min_sdk_version (system/core)
Many modules requiring min_sdk_version have been used without setting
it, but hard-coded in allowlist.

Bug: 158059172
Test: m
Change-Id: I9c6bd603e196eec97923e183dd0ae29884ed3947
2021-12-02 09:27:43 +09:00
Martin Stjernholm
277aa6b2ad Add prebuilt header modules exported by ART. am: dcd876fbe5 am: 36fa60d5d9 am: 1a3afdf97b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1906278

Change-Id: I0d279df929992a3ddbd52040669b0def975c9648
2021-12-01 12:34:56 +00:00
Martin Stjernholm
1a3afdf97b Add prebuilt header modules exported by ART. am: dcd876fbe5 am: 36fa60d5d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1906278

Change-Id: I6c6216c8e3b2a720ed8ee039f103f919e2008370
2021-12-01 12:23:43 +00:00
Martin Stjernholm
36fa60d5d9 Add prebuilt header modules exported by ART. am: dcd876fbe5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1906278

Change-Id: Ie518e563540a0cea7f67167d008093eceae9854e
2021-12-01 12:07:35 +00:00
Martin Stjernholm
dcd876fbe5 Add prebuilt header modules exported by ART.
These turned up as a result of the fix in
https://r.android.com/1906612. Both already exist without the
"prebuilt_" prefixes.

No-Allowed-Deps-Check: No new dependencies.
Test: m droid SOONG_CONFIG_art_module_source_build=false
  on internal master
Bug: 202192894
Change-Id: Ib67a26096d885fd325ebbb619ababaf80266c4a3
2021-11-30 19:06:50 +00:00
satayev
aafb884842 Simplify main function for mainline_modules_sdks.py am: 5511d9becd am: 2a6a04b99e am: 13095e41dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903874

Change-Id: I14c80d82d36f259b34973a5c494ac7164ef4b16f
2021-11-26 15:35:37 +00:00
satayev
144d580cba Allow passing python script as a parameter. am: 540616ff00 am: 7a9b41feae am: 4f317ac91e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903873

Change-Id: I651577377c6102c2d4503e229ab1ec4a5f1739b3
2021-11-26 15:35:13 +00:00
satayev
13095e41dc Simplify main function for mainline_modules_sdks.py am: 5511d9becd am: 2a6a04b99e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903874

Change-Id: I0ef967edc20b0ec50b0b0a72c9ec55e51d298858
2021-11-26 15:21:24 +00:00
satayev
4f317ac91e Allow passing python script as a parameter. am: 540616ff00 am: 7a9b41feae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903873

Change-Id: Id19c96d708da709e15405c31099337a9f9388123
2021-11-26 15:21:02 +00:00
satayev
2a6a04b99e Simplify main function for mainline_modules_sdks.py am: 5511d9becd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903874

Change-Id: Ie1d5c5e78836b73124253da79c75cc5c1a231168
2021-11-26 15:09:18 +00:00
satayev
7a9b41feae Allow passing python script as a parameter. am: 540616ff00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903873

Change-Id: I43cd1b7ca85e89e840d1f989928e0e327f999c72
2021-11-26 15:09:09 +00:00
satayev
5511d9becd Simplify main function for mainline_modules_sdks.py
Bug: 205100626
Test: presubmit
Change-Id: I2fdd371aad6a9c37703a190754604da2d86975b2
Merged-In: I2fdd371aad6a9c37703a190754604da2d86975b2
(cherry picked from commit a584ab5dc0)
2021-11-26 12:36:52 +00:00
satayev
540616ff00 Allow passing python script as a parameter.
This simplifies the setup for internal mainline_modules_sdks.sh and
removes duplication in logic.

Bug: 205100626
Test: TARGET_BUILD_APPS=com.android.wifi packages/modules/common/build/mainline_modules_sdks.sh && ls out/dist/mainline-sdks/current/com.android.wifi/sdk/wifi-module-sdk-current.zip
Change-Id: Icb079d7630fa77c250e9b2194cc30038b6d046ec
Merged-In: Icb079d7630fa77c250e9b2194cc30038b6d046ec
(cherry picked from commit 8f8f1bd9c9)
2021-11-26 12:35:33 +00:00
Treehugger Robot
d8c167fb7d Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." am: 809a186e06 am: fa3f148ecd am: fc893c694b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1875775

Change-Id: I894372a09e4793aa629d7d35c51f2e5911a59732
2021-11-25 12:54:18 +00:00
Treehugger Robot
fc893c694b Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." am: 809a186e06 am: fa3f148ecd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1875775

Change-Id: Ide4c2ba8db08a9e2b5051e7d34bb87f7248cec1e
2021-11-25 12:43:45 +00:00
Treehugger Robot
fa3f148ecd Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." am: 809a186e06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1875775

Change-Id: I28bfb1800e7c4e8a51603ef0e9fa67d0a00cab2b
2021-11-25 12:31:59 +00:00
Treehugger Robot
809a186e06 Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." 2021-11-25 12:17:58 +00:00
Jiakai Zhang
89b88df157 Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto.
This is an environment variable that lists the jars that system server
loads dynamically using separate classloaders. The list is derived from
PRODUCT_STANDALONE_SYSTEM_SERVER_JARS and
PRODUCT_APEX_PRODUCT_STANDALONE_SYSTEM_SERVER_JARS in Makefile. It will
be comsumed by odrefresh to determine what jars to preopt on early boot.

Note that the variable should not end with "CLASSPATH" because the list
is not used by runtime as a classpath. It is just a colon-separated list
of jars. System server loads the jars separately with paths hardcoded in
the code.

Bug: 203198541
Test: manual - 1. Build an image.
  2. Flash the image to a device.
  3. adb shell echo \$STANDALONE_SYSTEMSERVER_JARS
  4. See the correct list of jars.
Change-Id: I5a9653c606969aaa8083e8c8daa9d48b99663790
2021-11-25 10:48:25 +00:00
Jooyung Han
cbac7925eb Merge "Revert "Remove redundant lines in allowed_deps.txt"" am: bd5e510a29 am: 756c123b6e am: 7948cb1df7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1901433

Change-Id: I45bdfd418ddf2b70da2defc375a41663c22fc426
2021-11-24 07:04:30 +00:00
Jooyung Han
7948cb1df7 Merge "Revert "Remove redundant lines in allowed_deps.txt"" am: bd5e510a29 am: 756c123b6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1901433

Change-Id: Ic5b7ee1ce3a8456529b44e20118e113928ba5072
2021-11-24 06:54:24 +00:00
Jooyung Han
756c123b6e Merge "Revert "Remove redundant lines in allowed_deps.txt"" am: bd5e510a29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1901433

Change-Id: Ia0a44b9473c825d1848832e1833d9fae83074b2b
2021-11-24 06:37:06 +00:00
Jooyung Han
bd5e510a29 Merge "Revert "Remove redundant lines in allowed_deps.txt"" 2021-11-24 06:21:15 +00:00
Nahian Ashraf
28f82df646 Revert "Remove redundant lines in allowed_deps.txt"
This reverts commit 48217f59e4.

Reason for revert: Build Breakage

Change-Id: I84d8b136fee7ddd58af44a9054535dad530cb5db
2021-11-24 05:43:51 +00:00
Treehugger Robot
31c22e3d7f Merge "Remove redundant lines in allowed_deps.txt" am: 9e6046ceab am: b668fba6b3 am: ff6c25274d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900130

Change-Id: I58256f7d06d03b4915c6b0237fa229abacd48553
2021-11-24 04:21:08 +00:00
Treehugger Robot
ff6c25274d Merge "Remove redundant lines in allowed_deps.txt" am: 9e6046ceab am: b668fba6b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900130

Change-Id: Ibbc48693d6d50a70d2159b91ad3b42b78f30b194
2021-11-24 04:09:50 +00:00
Treehugger Robot
b668fba6b3 Merge "Remove redundant lines in allowed_deps.txt" am: 9e6046ceab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900130

Change-Id: I3df2476af3416845b6369218dd19f98b04775b9b
2021-11-24 03:58:43 +00:00
Treehugger Robot
9e6046ceab Merge "Remove redundant lines in allowed_deps.txt" 2021-11-24 03:47:37 +00:00
David Gross
308ebadd29 Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." am: c02a06e229 am: e2e6aa23e6 am: 89fa6fda7c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881328

Change-Id: I3118ac7b434e6309a75511e6e5fff5987a54d03f
2021-11-23 03:06:00 +00:00
David Gross
89fa6fda7c Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." am: c02a06e229 am: e2e6aa23e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881328

Change-Id: I945b2dc0b16412be0bc5a0470ebd5c9ffea61782
2021-11-23 02:49:06 +00:00
David Gross
e2e6aa23e6 Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." am: c02a06e229
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881328

Change-Id: Ic64989deb2f3b15fd1bd45458b6cf04073d148ad
2021-11-23 02:30:43 +00:00
David Gross
c02a06e229 Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." 2021-11-23 02:18:53 +00:00
Jooyung Han
02189d405a Set min_sdk_version (packages/modules/adb) am: ea45530b22 am: 5f20127587 am: bff9af4df7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1895325

Change-Id: I6e180a67792d40219559a6b80c6a6f9de4cf4b91
2021-11-22 23:39:06 +00:00
Jooyung Han
bff9af4df7 Set min_sdk_version (packages/modules/adb) am: ea45530b22 am: 5f20127587
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1895325

Change-Id: I6c4f0865673e437d122536cf2b8a95cd6e76c976
2021-11-22 23:21:37 +00:00
Jooyung Han
48217f59e4 Remove redundant lines in allowed_deps.txt
Since allowed_deps.txt only grows, there remain some redundant lines
when we set min_sdk_version modules which were tracked via
minSdkVersionAllowlist.

Manually removed these lines.

Bug: n/a
Test: m out/soong/apex/depsinfo/new-allowed-deps.txt.check
Change-Id: I7f81c5a580de2dce97d1fc2e88137f50b0a088e9
2021-11-23 08:19:05 +09:00
Jooyung Han
5f20127587 Set min_sdk_version (packages/modules/adb) am: ea45530b22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1895325

Change-Id: I92d6c95b3b98db53f68150536a262bcdfab36278
2021-11-22 23:07:54 +00:00
David Gross
b76f6ec731 Add android.hardware.neuralnetworks-V3-ndk to allowed_deps.
Apex-Size-Increase: N/A
Previous-Platform-Support: 30
Aosp-First: Yes
Ignore-AOSP-First: merge conflict resolutions
Test-Info: NeuralNetworksTest_static,VtsHalNeuralnetworksTargetTest

Bug: 202280917

Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksTargetTest

Merged-In: Ie9a45baca54ff6a6a95d4e78ac19a32741c2b0c7
Change-Id: Ie9a45baca54ff6a6a95d4e78ac19a32741c2b0c7
(cherry picked from commit 2fa8ac669f)
2021-11-22 14:39:36 -08:00
Jooyung Han
ea45530b22 Set min_sdk_version (packages/modules/adb)
Many modules requiring min_sdk_version have been used without setting
it, but hard-coded in allowlist.

Bug: 158059172
Test: m
Change-Id: Id5e0794b1ff31fc103185851b7a54c2aded2fe6f
2021-11-22 11:30:19 +09:00