Commit Graph

1055 Commits

Author SHA1 Message Date
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
664c10df20 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: Iae579187a51f1c1fd0689e1d29279f6b7f64565e
2021-11-10 13:04:56 +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
c70478a180 Merge "Change ExoPlayer library name" am: ecf5c0b3bd am: 8c61057f51
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885409

Change-Id: Ie0e27b3e7687bcef97ec9ea43bbf0b2fef4615a0
2021-11-10 10:34:54 +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
83c654a3ae 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: I8d54d2645abe10d46ec1fcd0dc7fdfab314f1575
2021-11-09 20:16:26 +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
satayev
94b1430ffe Change min max sdk version type to string.
This allows support of codenames, instead of pure integer version codes.

This is a safe change, since the fields are currently unused.

Bug: 190818041
Test: presubmit
Change-Id: Ic80330413c35f16d274fef721ff908f1fe380e55
2021-11-09 14:41:18 +00:00
satayev
a4a28ca731 Merge "Add mainline_modules_sdks to packages/modules/common/." am: 5d9396e2ba am: 8a9a327137
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881189

Change-Id: I1fcaf97f739bd65199bf16d6c3d95a633cf36b67
2021-11-05 14:44:43 +00:00
satayev
8a9a327137 Merge "Add mainline_modules_sdks to packages/modules/common/." am: 5d9396e2ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881189

Change-Id: I6ea66e4f6e7faea2f09b882d22ef4cb74ffd0899
2021-11-05 14:32:53 +00:00
satayev
5d9396e2ba Merge "Add mainline_modules_sdks to packages/modules/common/." 2021-11-05 14:14:31 +00:00
William Escande
bc0f5470c4 Migrate NetworkStack modules to use modules-utils
```
Dependency path: NetworkStack{os:android,arch:common}
           via tag java.dependencyTag: { name:staticlib}
    -> NetworkStackApiStableLib{os:android,arch:common}
           via tag java.dependencyTag: { name:staticlib}
    -> modules-utils-preconditions{os:android,arch:common,apex:}

Consider adding 'min_sdk_version: "29"' to "modules-utils-preconditions"
````

Bug: 198418216
Tag: #refactor
Test: Build
Change-Id: Ie646f5d54bdd3b101a70677ebe28eb3205dd88cc
2021-11-05 14:40:40 +01:00
satayev
51133ffa60 Add mainline_modules_sdks to packages/modules/common/.
Change the list of modules to match AOSP list.

Bug: 205100626
Test: atest mainline_modules_sdks_test
Change-Id: I250c4aafcda5c3c1d636dac27ff5ffaa78b69b2a
2021-11-04 14:48:39 +00:00
Remi NGUYEN VAN
150a2a0ad9 Merge "Add networkstack-aidl-latest to allowed_deps" am: d1e683a867 am: 831c7337ee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876688

Change-Id: I934897cbd321dab1c1109aa9d9eeca2003915e7e
2021-11-04 06:44:13 +00:00
Remi NGUYEN VAN
831c7337ee Merge "Add networkstack-aidl-latest to allowed_deps" am: d1e683a867
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876688

Change-Id: I60fb48257b7211b8c680f79fe087b118cec48a17
2021-11-04 06:31:02 +00:00
Remi NGUYEN VAN
d1e683a867 Merge "Add networkstack-aidl-latest to allowed_deps" 2021-11-04 06:19:17 +00:00
Mohammad Islam
8c4f73742b Merge "Add visibility to test artifacts used for apexd_test" am: 169c01cc2b am: a3dd028010
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1853953

Change-Id: Ie71aea7625003e8c39101024d329d519547a6cbe
2021-11-02 10:11:24 +00:00
Mohammad Islam
a3dd028010 Merge "Add visibility to test artifacts used for apexd_test" am: 169c01cc2b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1853953

Change-Id: I5aa5194e73d5f8885adc5af8857fd5d11c5756f7
2021-11-02 09:07:15 +00:00
Mohammad Islam
169c01cc2b Merge "Add visibility to test artifacts used for apexd_test" 2021-11-02 08:51:01 +00:00
Martin Stjernholm
5f9017e483 Add prebuilt dependencies for the ART module. am: 2ea2ff81e0 am: 74ad317579
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1873617

Change-Id: Id974be76aa2666cfdff5f9a76f33e2d57722a9f0
2021-11-01 19:51:28 +00:00
Martin Stjernholm
74ad317579 Add prebuilt dependencies for the ART module. am: 2ea2ff81e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1873617

Change-Id: Ied981b96a93961861384f84c3ae5025925c13015
2021-11-01 19:33:19 +00:00
Remi NGUYEN VAN
df1b52b7f3 Add networkstack-aidl-latest to allowed_deps
networkstack-aidl-latest is just the combination of
ipmemorystore-aidl-interfaces-V10-java and
networkstack-aidl-interfaces-V12-java, which were already included by
the module.

Apex-Size-Increase: 0
Previous-Platform-Support: As before
Aosp-First: YES
Test-Info: As before (code is part of NetworkStack codebase)

Test: m
Change-Id: I2c5b68652b6c600a659d355bc70b34b3db2d3b99
2021-11-01 12:55:00 +09:00
Martin Stjernholm
2ea2ff81e0 Add prebuilt dependencies for the ART module.
All these dependencies already exist in allowed_deps.txt, but without
"prebuilt_" prefixes. They are used only when the ART module is built
from prebuilts of its dependencies, i.e. with the master-art thin
manifest.

Test: env TARGET_BUILD_APPS=com.google.android.art \
        vendor/google/build/mainline_modules_sdks.sh
  using the thin master-art manifest
Bug: 202192894
Change-Id: I4b70e3dbdb30cdc9d25b92866b40f6f05babed20
2021-10-29 18:21:35 +01:00
Martin Stjernholm
908d5fc7d8 Switching ART libs to set min_sdk_version by number.
Test: m droid
Bug: 204364566
Change-Id: I7478c6cf2fabe57e39cbfe36ef288c8f892965ea
2021-10-28 19:34:33 +01:00
Martin Stjernholm
07d11b2b36 Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." am: bc31e5108b am: ac5c23c286
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869977

Change-Id: I46cc3e9c2c4e0f42f66663b305d832f2175850f7
2021-10-28 10:45:50 +00:00
Martin Stjernholm
ac5c23c286 Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." am: bc31e5108b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869977

Change-Id: I6652b59513577d4e82ffb46f6dac54782c2dbc3c
2021-10-28 10:25:59 +00:00
Martin Stjernholm
bc31e5108b Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." 2021-10-28 09:50:28 +00:00
Martin Stjernholm
2aed427c97 Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland).
It needs to be controlled by build instead:

- Prebuilt SDKs should be used for unbundled Mainline module builds, and
  is necessary on thin module branches to avoid dependencies on
  frameworks/base (e.g. framework-doc-stubs used by lint-check).

- Source SDKs are needed on master which can otherwise get problems
  with out of date prebuilts (see e.g. b/140162931).

This relands https://r.android.com/1862861 after (temporarily)
overriding the flag to true in Mainline builds (cl/405889455), until
b/204189791 is fixed.

Test: env TARGET_BUILD_APPS=com.android.art \
        packages/modules/common/build/build_unbundled_mainline_module.sh \
        --product module_arm --dist_dir out/dist
  using the thin master-art manifest
Bug: 202192894
Change-Id: I974be07cfcc5a02611b465cc402178985d8decd8
2021-10-27 20:48:03 +01:00
Matthew Maurer
869de271e5 Merge "Allow thiserror for use in DoH" am: e8ef57b3db am: 54fbea087d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1870837

Change-Id: I979a9a4133294beb722a59af1613984591539766
2021-10-27 19:31:36 +00:00
Matthew Maurer
54fbea087d Merge "Allow thiserror for use in DoH" am: e8ef57b3db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1870837

Change-Id: Ic40c52d3e4917ea7531153ef64a5bf9eb32d6e44
2021-10-27 18:50:07 +00:00
Matthew Maurer
e8ef57b3db Merge "Allow thiserror for use in DoH" 2021-10-27 18:20:24 +00:00
Hui Wang
e3d2d328df Apply new settings widget lib for cbr roaming feature support
Added deps: SettingsLibTopIntroPreference
Apex-Size-Increase: 24k
Aosp-First: No
Ignore-AOSP-First: changes in topics with internal-first projects
Previous-Platform-Support: Yes
Test-Info: manaul test for the settings UI

Bug: 198618350
Test: make, manual
Change-Id: If84ddef126b0ab5687e3dd5b00a2fc9bf09ef169
2021-10-27 18:15:20 +00:00
markchien
439fdaf7f9 Add libbpfmapjni to allowed_deps.txt am: 8c3cb8f180 am: affae29c01
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869334

Change-Id: Iee6bda5fae1f8c303f6f2a38790b08f1b6b4c77e
2021-10-27 10:32:08 +00:00
markchien
affae29c01 Add libbpfmapjni to allowed_deps.txt am: 8c3cb8f180
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869334

Change-Id: I091caa89a2dc6ee5588f4d840e27e624965f7f8c
2021-10-27 10:11:28 +00:00
Matthew Maurer
f144f37289 Allow thiserror for use in DoH
This is a macro+instance-only crate, so it adds no weight by itself.

Test: DoH throughput test
Apex-Size-Increase: 0k
Previous-Platform-Support: No platform dependencies
Aosp-First: AOSP-first
Test-Info: Unit tests run in TEST_MAPPING on project updates
Bug: 202081046

Change-Id: Id558a6729814bf4d0229dd53a4cf277b887a9e31
2021-10-26 18:25:17 -07:00
markchien
8c3cb8f180 Add libbpfmapjni to allowed_deps.txt
Apex-Size-Increase: 4096 B
before:
$ ls -al out/target/product/vsoc_x86_64/system/apex/com.android.tethering.apex
-rw-r----- 1 markchien primarygroup 2879488 Oct 26 19:07 out/target/product/vsoc_x86_64/system/apex/com.android.tethering.apex
after:
$ ls -al out/target/product/vsoc_x86_64/system/apex/com.android.tethering.apex
-rw-r----- 1 markchien primarygroup 2875392 Oct 26 19:14 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
libbpfmapjni is separate from tethering module code for other module to
easily use bpf map.

Aosp-First: yes

Test-Info: there is no behavior change for tethering module.
libbpfmapjni is tested by TetheringPrivilegedTests which is setup in
postsubmit currently (may move to presubmit).

Bug: 179733303
Test: TH

Change-Id: Idb629e6e07fcd6c2f25217af172126fd2499a301
2021-10-26 11:47:32 +00:00
Michael Butler
509e6391aa Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt" am: 539ebcd77e am: 3220f257f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869529

Change-Id: Icd637e812c5d8baa863931e62c2b9d4512a7a017
2021-10-26 05:11:45 +00:00
Michael Butler
3220f257f8 Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt" am: 539ebcd77e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869529

Change-Id: I28671831131728526f0f85b04e9598d6fade7abe
2021-10-26 04:58:28 +00:00
Michael Butler
539ebcd77e Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt"
Revert "Provide explicitly version NNAPI AIDL utils lib -- runtime."

Revert submission 16007539-nnapi-experimental-aidl-feature

Reason for revert: The cherry-pick of this CL breaks the build
Reverted Changes:
Ieb2da3461:Add neuralnetworks_utils_hal_aidl_v2 to allowed_de...
I8ae01e3c6:Provide explicitly version NNAPI AIDL utils lib --...
I74f1798e8:Provide explicitly versioned NNAPI AIDL utils libs...
I2362464e8:Use explicitly versioned NNAPI HAL util libs in da...

No-Allowed-Deps-Check: This CL is a revert
Test: mma

Change-Id: Ia7df07ab9b2b1b96be2cccf53d87ade8323b3abe
Merged-In: Ia7df07ab9b2b1b96be2cccf53d87ade8323b3abe
(cherry picked from commit 1792be2e01)
2021-10-25 21:12:43 -07:00
Xusong Wang
9c339126f5 Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt am: 363e6a3e5f am: 89055c91e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869905

Change-Id: Iadc433611b06a87f4b84fe89c5b7373508293432
2021-10-26 00:01:09 +00:00
Xusong Wang
89055c91e1 Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt am: 363e6a3e5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869905

Change-Id: I1f0ce0092e1a473e26fd7a8b99a63bb6d4d199d5
2021-10-25 23:44:47 +00:00