Commit Graph

32705 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
c6dc74ed9f Merge changes from topic "nearby_tethering_apex"
* changes:
  Remove nearby API surface
  Revert "Start NearbyService when system server starts."
2022-01-31 04:25:49 +00:00
Paul Duffin
3578c8f2ee Merge changes I58502249,I6db85a44 am: 4d6002c204 am: e9485a4144 am: a3efbc72d0 am: 2b0ee55eb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965061

Change-Id: If3f90636d72521fd068cb1c3c1d3167604fe0de5
2022-01-28 17:27:24 +00:00
Paul Duffin
57533b4d83 Merge system and module-lib APIs from conscrypt and i18n
Previously, conscrypt and i18n were excluded from the list of modules
from which combined_apis retrieved system and module-lib API files as
they did not provide those files. They now provide those files so no
longer need to be treated specially.

The conscrypt and i18n (and art) are excluded from the
framework-updatable-stubs-module_libs_api as that is used with a
java_system_modules that already provides the conscrypt and i18n
and art APIs.

Bug: 216435117
Test: m all-modules-system-stubs
      m frameworks-base-api-system-current.txt
      m frameworks-base-api-module-lib-current.txt
Change-Id: I58502249c59b1faa65fb288ac11becd9496ff37e
2022-01-28 08:50:24 +00:00
Paul Duffin
a114f9899c Merge annotations zip from conscrypt and i18n
Previously, conscrypt and i18n were excluded from the list of modules
from which combined_apis retrieved annotation zip files as they did not
provide those files. They now provide those files so no longer need to
be treated specially.

Bug: 216435117
Test: m sdk-annotations.zip
Change-Id: I6db85a44715362dfb288ddf9010e2289233acf78
2022-01-28 08:47:13 +00:00
Remi NGUYEN VAN
0b692d5b50 Remove nearby API surface
It is being merged into the tethering/connectivity API surface, under
the existing framework-connectivity-t API.

Bug: 189355156
Test: m
Change-Id: I5878ffc1449f0eb19abdccd34d5c8ca1f711fbc8
2022-01-28 11:25:09 +09:00
Anton Hansson
c6e9d2ffe2 Generate merged public and system stubs
Eliminate another two enumerations of all modules.

Bug: 169103987
Test: m android_{,system_}stubs_current && diff intermediates (no diffs)
Merged-In: I0d35f1e76320356ee4e5535a40614cf7d8ff4486
Change-Id: I0d35f1e76320356ee4e5535a40614cf7d8ff4486
2022-01-27 12:34:37 +00:00
Frank Wang
07861f70d3 Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."
Revert^2 "Add bootclasspath config in Auxiliary."

ba33413304d140c02bd8d2477576fb19889af031

Change-Id: I2e8f05406c90565b517f5d7d05aae0dc6d8a4200
2022-01-27 07:52:21 +00:00
Roopa Sattiraju
86058b62d8 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Merged-In: I636f00132a13467e63b08f21d9cc9dcaab250b8a
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-26 14:21:29 -08:00
Anton Hansson
04ab8c6634 Generate merged public and system stubs
Eliminate another two enumerations of all modules.

Bug: 169103987
Test: m android_{,system_}stubs_current && diff intermediates (no diffs)
Change-Id: I0d35f1e76320356ee4e5535a40614cf7d8ff4486
2022-01-26 10:19:55 +00:00
Roopa Sattiraju
8e30577d04 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-25 14:46:30 -08:00
Johnny Lee
d07b757a6a Revert "Add SupplementalProcess stubs and bootclasspath fragment"
Revert "Add bootclasspath config in Auxiliary."

Revert "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS"

Revert submission 16684516-auxiliary_bcp

Reason for revert: pdk build breakage
Reverted Changes:
I8c92d2ccb:Add bootclasspath config in Auxiliary.
I9ac910fa2:Add SupplementalProcess stubs and bootclasspath fr...
I7cf3b31b0:Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS

Bug: 216218564
Change-Id: Ie4374fed1e4869ae194b59e2298db785e647ed4f
2022-01-25 06:58:55 +00:00
Frank Wang
f2bb5e0c5f Add SupplementalProcess stubs and bootclasspath fragment
Test: Builds
Bug: b/210728915
Change-Id: I9ac910fa2275eb68faed05a800e990eef6a1fe90
2022-01-24 15:55:40 +00:00
paulhu
c100db56a2 Split out the nsd API surface and use framework-connectivity-tiramisu
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Merged-In: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
2022-01-19 18:47:45 +08:00
Nikita Ioffe
e48d201053 Add service-supplementalprocess to combined_apis
Test: m
Bug: 212577961
Change-Id: Id05c53612ec5a6fe9abeaed441da5c8b164844ce
2022-01-18 19:47:51 +00:00
Anton Hansson
4468d7c6bf Create a filegroup for public stub sources
For use by framework-doc-stubs, to avoid duplicating the list of
modules there.

Bug: 169103987
Test: m framework-doc-stubs ; diff intermediates before & after
Merged-In: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
Change-Id: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
2022-01-17 19:07:11 +00:00
Anton Hansson
fd31645f85 Minor refactorings in api.go
- Make a more generically useful "expandArray" function that can handle
  all the various transforms needed here (another one in the next cl).
- Move all the utility functions to the bottom of the file.

Test: presubmit
Merged-In: If0362c6dd90635831ac2cb2f7da336212f4c23fd
Change-Id: If0362c6dd90635831ac2cb2f7da336212f4c23fd
2022-01-17 19:07:10 +00:00
Anton Hansson
cb00f94596 Convert merged module lib stub to api.go
Bug: 169103987
Test: m framework-updatable-stubs-module_libs_api and diff intermediates
      folder before and after.
Merged-In: I6018791ae136bc764a6e846078c6bce59bcc123b
Change-Id: I6018791ae136bc764a6e846078c6bce59bcc123b
2022-01-17 19:07:09 +00:00
Anton Hansson
05e944d8df Some minor tweaks for api.go
- Make constants for re-used hardcoded module names
- Add a removeAll function
- Move filtering into individual "create" methods.

Bug: 169103987
Test: mmm frameworks/base/api
Merged-In: Id81c93eafdbdbbd0f55a4a906150b58a001392f6
Change-Id: Id81c93eafdbdbbd0f55a4a906150b58a001392f6
2022-01-17 19:07:08 +00:00
Anton Hansson
07a1295cfa Temporarily add support for conditional modules
Some bootclasspath libraries are currently conditionally included
in the SDK. Add support for that in api.go.

Bug: 169103987
Test: mmm frameworks/base/api
Merged-In: I7704a884675eb58c429a59f99a663cf09807ecec
Change-Id: I7704a884675eb58c429a59f99a663cf09807ecec
2022-01-17 19:07:07 +00:00
Anton Hansson
cc18e03e44 Construct sdk-annotations.zip programmatically
Avoid hardcoding the list of modules in yet another place.

Bug: 169103987
Test: diff zip before & after (identical)
Merged-In: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
Change-Id: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
2022-01-17 19:07:05 +00:00
Anton Hansson
ec450c058e Replace manual genrule modules with combined_apis
This simplifies the addition of new modules by cutting down the number
of lists that the new module must be added to. The combined_apis module
generates equivalent genrules in a programmatic fashion.

Bug: 169103987
Test: `mmm frameworks/base/api` before and after and compare the soong
      intermediates of that folder.
Merged-In: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
Change-Id: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
2022-01-17 19:07:04 +00:00
Anton Hansson
ecf9fc3cab Create a filegroup for public stub sources
For use by framework-doc-stubs, to avoid duplicating the list of
modules there.

Bug: 169103987
Test: m framework-doc-stubs ; diff intermediates before & after
Change-Id: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
2022-01-17 10:21:36 +00:00
Anton Hansson
899766a79e Minor refactorings in api.go
- Make a more generically useful "expandArray" function that can handle
  all the various transforms needed here (another one in the next cl).
- Move all the utility functions to the bottom of the file.

Test: presubmit
Change-Id: If0362c6dd90635831ac2cb2f7da336212f4c23fd
2022-01-14 16:15:11 +00:00
Anton Hansson
47ff71a902 Convert merged module lib stub to api.go
Bug: 169103987
Test: m framework-updatable-stubs-module_libs_api and diff intermediates
      folder before and after.
Change-Id: I6018791ae136bc764a6e846078c6bce59bcc123b
2022-01-13 15:07:09 +00:00
Anton Hansson
b108f75b9d Some minor tweaks for api.go
- Make constants for re-used hardcoded module names
- Add a removeAll function
- Move filtering into individual "create" methods.

Bug: 169103987
Test: mmm frameworks/base/api
Change-Id: Id81c93eafdbdbbd0f55a4a906150b58a001392f6
2022-01-13 15:04:13 +00:00
Anton Hansson
a8e3488cc3 Temporarily add support for conditional modules
Some bootclasspath libraries are currently conditionally included
in the SDK. Add support for that in api.go.

Bug: 169103987
Test: mmm frameworks/base/api
Change-Id: I7704a884675eb58c429a59f99a663cf09807ecec
2022-01-13 09:48:09 +00:00
Anton Hansson
16ff357dfd Refactor api.go to simplify Android.bp further
The gitlinter tool consumes the Android.bp file and from it mines
the module names of libraries that contribute to the public API surface.
The format required by the previous incarnation of api.go (creating a
list in Android.bp and passing that multiple times) did not lend itself
to being easily consumed by gitlinter.

So, change some of the constructs to simplify the Android.bp definition:
- hardcode a couple of "anomalies" inside the go code instead (which
  modules have only public APIs and what modules should be filtered
  from the lint DB). There's no real benefit to plumb them through the
  Android.bp.
- only pass the list of modules once (this allows inlining the list)

Also change the output filename of the genrules. This makes no practical
difference but does match the existing genrules.

Bug: 169103987
Test: in the followup-change that defines a combined_apis
Change-Id: I6715fa9d24603e3cbb8b09510b64c2bf6bac1f27
Merged-In: I6715fa9d24603e3cbb8b09510b64c2bf6bac1f27
2022-01-13 09:26:08 +00:00
Anton Hansson
7a173a626f Construct sdk-annotations.zip programmatically
Avoid hardcoding the list of modules in yet another place.

Bug: 169103987
Test: diff zip before & after (identical)
Change-Id: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
2022-01-12 14:45:22 +00:00
Anton Hansson
648e609e30 Replace manual genrule modules with combined_apis
This simplifies the addition of new modules by cutting down the number
of lists that the new module must be added to. The combined_apis module
generates equivalent genrules in a programmatic fashion.

Bug: 169103987
Test: `mmm frameworks/base/api` before and after and compare the soong
      intermediates of that folder.
Change-Id: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
2022-01-12 12:27:37 +00:00
Anton Hansson
28eda09cf5 Refactor api.go to simplify Android.bp further
The gitlinter tool consumes the Android.bp file and from it mines
the module names of libraries that contribute to the public API surface.
The format required by the previous incarnation of api.go (creating a
list in Android.bp and passing that multiple times) did not lend itself
to being easily consumed by gitlinter.

So, change some of the constructs to simplify the Android.bp definition:
- hardcode a couple of "anomalies" inside the go code instead (which
  modules have only public APIs and what modules should be filtered
  from the lint DB). There's no real benefit to plumb them through the
  Android.bp.
- only pass the list of modules once (this allows inlining the list)

Also change the output filename of the genrules. This makes no practical
difference but does match the existing genrules.

Bug: 169103987
Test: in the followup-change that defines a combined_apis
Change-Id: I6715fa9d24603e3cbb8b09510b64c2bf6bac1f27
2022-01-12 12:27:30 +00:00
Anton Hansson
c99c94be5f Merge "Generate genrule modules for merged api txts" am: faea0b39ec am: 02bf418739 am: be5132914e am: 7cda9336dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853040

Change-Id: I8dbe15269ed213a19c6a4ead78275d4748cf86bd
2022-01-11 17:24:04 +00:00
Anton Hansson
0860aaf958 Generate genrule modules for merged api txts
Add a soong plugin that can generate the genrule definitions for the
merged api txt files. This will allow removing a lot of duplicated
lists in the Android.bp and simplify adding new modules.

Bug: 169103987
Test: follow-up that uses these rules (branch dependent)
Change-Id: I0c7a9921b7f4c5b74f8b652cb357abf9444ce93f
2022-01-10 16:50:27 +00:00
Anton Hansson
e73c58ed5a Merge "Remove references to win_sdk" am: dddbdc3b15 am: a9e069273a am: d8393273c3 am: a46d68e30e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933148

Change-Id: I1ec863baceaa62ebedc669635928d5d981c30917
2022-01-05 19:40:51 +00:00
Anton Hansson
dd8ef67a61 Remove references to win_sdk
This goal doesn't exist anymore. The build system automatically
translates it to "sdk".

Test: m win_sdk dist && inspect out/dist/apistubs
Change-Id: Ifc4fb07ce32ef21906e8bb8eae0003b1486a525a
2022-01-04 08:57:28 +00:00
paulhu
f45fe96a54 Split out the nsd API surface and use framework-connectivity-tiramisu
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
2021-12-15 02:10:38 +00:00
Gavin Corkery
bc0064491a Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."
Revert "Revert "Add framework-supplementalprocess to PRODUCT_APE..."

Revert^2 "Add framework-supplementalprocess prebuilts"

e0c2a4dea0d0e27abad0cd3e4d440ab8f82752e4

Change-Id: I98366465906bb6b78ecf75a9a2319f64feb25beb
2021-11-16 22:33:10 +00:00
Gavin Corkery
bddffaa432 Revert "Add SupplementalProcess stubs and bootclasspath fragment"
Revert "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS"

Revert "Add framework-supplementalprocess prebuilts"

Revert submission 16194363-supplementalprocess-stubs

Reason for revert: PDK build break
Reverted Changes:
Ie1d3605d2:Add SupplementalProcess stubs and bootclasspath fr...
I1ea34faba:Add framework-supplementalprocess to PRODUCT_APEX_...
I8ef2a4c0f:Add jars and fragment to SupplementalProcess apex
Ibf9444f89:Add framework-supplementalprocess prebuilts

Change-Id: Ic569389a4b3a54323c283e9573590686ce27f491
2021-11-15 20:39:32 +00:00
Gavin Corkery
1ed8ac994d Add SupplementalProcess stubs and bootclasspath fragment
Test: Builds
Bug: 204989700
Change-Id: Ie1d3605d2991fa0402db8238ca01e4aa6bad3fdb
2021-11-09 11:11:18 +00:00
Chun Zhang
a615ce518d Add nearby mainline module public/system Api to the collection.
Test: skip test for config change.
Bug: 204780849
Change-Id: I51d550cb9cc2a649b7ac5da2aa01d1cb2c7bbb52
2021-11-05 15:57:39 +00:00
Anton Hansson
cedf8bade7 Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108 am: 2e4629a729 am: 7fafe71ffc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850198

Change-Id: Id0eba8d4c25a84c39e767d4738534880d422523e
2021-10-11 17:03:50 +00:00
Anton Hansson
74b15ca3c5 Merge "Rename merged services.txt module" 2021-10-11 15:57:02 +00:00
Anton Hansson
abce6f0784 Rename merged services.txt module
This makes it follow the same naming pattern as other modules
in this directory, which makes it easier to auto-generate.

Bug: 169103987
Test: m
Change-Id: I1c68a433808c034e83049239a72c9b505546bf20
2021-10-08 16:14:25 +01:00
Anton Hansson
766c2b1365 Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a am: 7ccd3666d6 am: 0d084d8990 am: 0ac02ae06e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: If90096b541453e70453069cb2596422001dacef0
2021-09-28 13:00:22 +00:00
Anton Hansson
b370ca080a Merge "Add a tool for merging annotation.zip files" am: 0e4260d772
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I3f2685923a00e0ef8bf9c6261eae93b5ede287b0
2021-09-28 10:46:16 +00:00
Anton Hansson
0e4260d772 Merge "Add a tool for merging annotation.zip files" 2021-09-28 10:27:22 +00:00
Treehugger Robot
bb68ff944e Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444 am: 86ac824eb9 am: ace5d30a1d am: b7105599ad am: 7335ef8e09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I1b41d956956888f96596415f13693a39936ad100
2021-09-28 01:03:18 +00:00
Treehugger Robot
86ac824eb9 Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I5d572a1b11cf7025251b30c6257f0fe854185aea
2021-09-28 00:13:14 +00:00
Anton Hansson
e673784439 Add a tool for merging annotation.zip files
We now produce annotation.zip files individually for each module, but
for the public SDK it's easier to distribute a single zip file with
merged contents. Add a tool for merging these (simple) files.

Bug: 187397779
Test: unittest in cl
Test: diff tests in follow-on CL merging all module annotations.zip
Change-Id: Ic5bb94425dccafab43340805f73fafacab53cb28
2021-09-27 17:46:26 +01:00
yangbill
8ebeef3b20 Set verbosity for api_versions_trimmer_unittests
Tradefed will need the python unit test verbosity to be set as 2 to make
the test cases information could be parsing correctly.

Bug: 201273904
Test: atest api_versions_trimmer_unittests
Change-Id: I414eb9ec18dbe45e9d2360a5c1baa0bc0b315170
2021-09-27 21:42:53 +08:00
Anton Hansson
0e71107764 Merge "Make merged api compat checks output baseline" am: 6c20a2d6b2 am: c010164844 am: 25274a4c6c am: 3afc6af257 am: 5f21da5428
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832239

Change-Id: I1274c2a17c54768e00733177cb09b0b9fdc45aa0
2021-09-23 06:33:48 +00:00