Commit Graph

1161 Commits

Author SHA1 Message Date
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
4a6efc6d20 Merge "Add mainline_modules_sdks to packages/modules/common/." am: 5d9396e2ba am: 8a9a327137 am: 86bc35a742 am: 6e0343bfee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881189

Change-Id: I2be7005dc7d2061d45c833f45a85ed09c9ccba1b
2021-11-05 15:09:48 +00:00
satayev
6e0343bfee Merge "Add mainline_modules_sdks to packages/modules/common/." am: 5d9396e2ba am: 8a9a327137 am: 86bc35a742
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881189

Change-Id: If0ef4cbc739917fb2ae20d63ddd705f36751c2f7
2021-11-05 14:56:09 +00:00
satayev
86bc35a742 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: I8e8e1f7cf214115df0d9c823a1b85e53ccbf5c29
2021-11-05 14:44:19 +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
17d29ed6f0 Merge "Add networkstack-aidl-latest to allowed_deps" am: d1e683a867 am: 831c7337ee am: bffa2ccfba am: 0bf623e923
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876688

Change-Id: I2fc793af0addf99767f8e0f93bee6d7299cc4f3f
2021-11-04 07:19:18 +00:00
Remi NGUYEN VAN
0bf623e923 Merge "Add networkstack-aidl-latest to allowed_deps" am: d1e683a867 am: 831c7337ee am: bffa2ccfba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1876688

Change-Id: Iba317d3c2b89a84f460e28dd38e76a994e4b8089
2021-11-04 07:01:17 +00:00
Remi NGUYEN VAN
bffa2ccfba 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: I861121a817cd942fa247b92cbdd34dcdeb3f0fa3
2021-11-04 06:45:04 +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
450e071607 Merge "Add visibility to test artifacts used for apexd_test" am: 169c01cc2b am: a3dd028010 am: 0f71d440ec am: 496855e79e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1853953

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

Change-Id: Ib98ea197ad862d5c6f55808f12262ba627da1200
2021-11-02 10:26:19 +00:00
Mohammad Islam
0f71d440ec 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: I00cb7ca4abb41cf3538cb19eeb1c83f52aff2d13
2021-11-02 10:11:56 +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
c35f7903e9 Add prebuilt dependencies for the ART module. am: 2ea2ff81e0 am: 74ad317579 am: 8b050ef1c0 am: 5a86ec6834
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1873617

Change-Id: I9e6acec004bd5871b0faa345a693bc2d28c5e1b8
2021-11-01 20:28:04 +00:00
Martin Stjernholm
5a86ec6834 Add prebuilt dependencies for the ART module. am: 2ea2ff81e0 am: 74ad317579 am: 8b050ef1c0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1873617

Change-Id: I85364420bfb6fd79f68ccbda8d718cb5e74d482f
2021-11-01 20:06:29 +00:00
Martin Stjernholm
8b050ef1c0 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: Ia155e41b79f47688c956db3b8353e5e2b45e4074
2021-11-01 19:51:27 +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
f51fc1a795 Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." am: bc31e5108b am: ac5c23c286 am: 0d06e3456c am: 3289842c71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869977

Change-Id: Ic6e2d6b5a40545d8b83ed5247b3d0b99009eb05f
2021-10-28 11:09:15 +00:00
Martin Stjernholm
3289842c71 Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." am: bc31e5108b am: ac5c23c286 am: 0d06e3456c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869977

Change-Id: Ia28c3418b45b5032a35082803c5a4154a1b14152
2021-10-28 10:56:45 +00:00
Martin Stjernholm
0d06e3456c 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: I6ce7edecd5c9b934af5b931900ac4def1d9b9ffe
2021-10-28 10:45:30 +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
Matthew Maurer
eecc1265d7 Merge "Allow thiserror for use in DoH" am: e8ef57b3db am: 54fbea087d am: 1893b427d7 am: c18588fc48
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1870837

Change-Id: Iadfd671a5951bfcd69ab6ff931fa2f37ada92dc6
2021-10-27 20:21:55 +00:00
Matthew Maurer
c18588fc48 Merge "Allow thiserror for use in DoH" am: e8ef57b3db am: 54fbea087d am: 1893b427d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1870837

Change-Id: I56eeee2b1c88f7eeee00edeafdd267c7e1af805a
2021-10-27 20:02:04 +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
1893b427d7 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: I7cefafa590769706a3de34047d30de26adab0514
2021-10-27 19:32:27 +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
markchien
f51ec9b4a7 Add libbpfmapjni to allowed_deps.txt am: 8c3cb8f180 am: affae29c01 am: cbbbaa7899 am: 39ff3833f5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869334

Change-Id: I66f12b36cfe44bac24d8366d04256cfc875ee715
2021-10-27 11:15:35 +00:00
markchien
39ff3833f5 Add libbpfmapjni to allowed_deps.txt am: 8c3cb8f180 am: affae29c01 am: cbbbaa7899
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869334

Change-Id: Id227fa9b633b714be94d178d445229854df61c9e
2021-10-27 11:00:13 +00:00
markchien
cbbbaa7899 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: I1da3d4384e166739811af8ff3acabc4233575c2a
2021-10-27 10:30:35 +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
0600add6fd Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt" am: 539ebcd77e am: 3220f257f8 am: 773be8e579 am: c688b39515
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869529

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

Change-Id: I9080612f99cc52705c6a1b2d8dc0c4f5ed0c328a
2021-10-26 05:22:49 +00:00
Michael Butler
773be8e579 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: I8f0fbb717120f4d9be207fbef6820f53c5fc2911
2021-10-26 05:11:43 +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
c903f97973 Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt am: 363e6a3e5f am: 89055c91e1 am: d2a85e8796 am: 224a975d9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869905

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

Change-Id: I006b51c632c08fcce0fc0f7b142c4309723d98c0
2021-10-26 00:15:43 +00:00
Xusong Wang
d2a85e8796 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: I854956ef4303665100b516b403d4023cd44be5fa
2021-10-26 00:01:11 +00:00