Commit Graph

32743 Commits

Author SHA1 Message Date
Anton Hansson
58963eb774 Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561 am: b103f0d765 am: 160df6f35f am: 4d140b4023
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126

Change-Id: I5ea66c24d1f50c128c6ff483f4e543970114376c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:16:01 +00:00
Anton Hansson
e7edf5d7e3 Merge "Refactor merged annotations creation" am: 24f473395d am: 6ca396706d am: d4b424edeb am: 4a658e1f97 am: e18de8858f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132125

Change-Id: I0b87e7a697a625daa135dde421a353d152411c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:13:58 +00:00
Anton Hansson
b103f0d765 Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126

Change-Id: I1069faa26c031375b8ffb3700c9c8ceb156cbfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:36:58 +00:00
Anton Hansson
d4b424edeb Merge "Refactor merged annotations creation" am: 24f473395d am: 6ca396706d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132125

Change-Id: I42b2f8b7e4bfbee7077a658753304af0debbf4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:33:38 +00:00
Anton Hansson
74b1564144 Add a system variant of the merged annotations
This is going to be disted instead of the monolithic one being
used currently.

Bug: 235140934
Test: m sdk-annotations{,-system}.zip and diff; manual spot checking
Test: m sdk dist && diff out/dist/system-data/annotations.zip with this
Change-Id: I9874f88e933a8b804a73638e6bac7a9d312c7c9f
2022-06-23 10:15:29 +00:00
Anton Hansson
0c5d9ab598 Refactor merged annotations creation
It's clearer to define the module in Android.bp, and keep
our custom Go code to the minimal. The only thing the go
code really needs to do is create a "all module annotations"
module. This matches the pattern of the other modules here (the
pattern was invented after sdk-annotations.zip was first
migrated).

Bug: 235140934
Test: m sdk-annotations.zip before/after (no diffs)
Change-Id: Iae246081bcf4e5177d1da98c2e01c702fb349a22
2022-06-23 08:04:55 +00:00
Jiakai Zhang
1489e0da35 Add service-art to Android SDK.
Bug: 235330409
Test: Presubmit
Change-Id: I1f398cbe77c5a1cba78daa47e17f40ccd709c8a4
2022-06-17 12:17:40 +01:00
Anton Hansson
79d883b7ac Merge "Use lint database from api_version_public" am: 39ebb3b0c0 am: d708548986
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092243

Change-Id: Ic7554fcb2a7ce3708354ac934b2e636d36e0e23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:08 +00:00
Anton Hansson
247c5f26ec Use lint database from api_version_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Droidstubs now support using the api-versions.xml from another
droidstubs module, so reuse the one from api_versions_public
in framework-doc-stubs.

Bug: 187398174
Test: diff api-versions.xml
Test: diff stubs of framework-doc-stubs
Change-Id: I774be9097e97d6b180fe54d799c94515780be6ec
2022-05-09 12:18:46 +00:00
Paul Duffin
365021f866 Remove unnecessary work around for updatable-media
Bug: 190807367
Bug: 229932396
Test: m framework-all
Change-Id: I70590910144141a534b926f884e9f08e4e3af5ca
2022-04-28 22:35:53 +00:00
Anton Hansson
dc3afbe3ca Merge "Fix mistake in disting of api txt" am: 89ee3e6394 am: fc4d75a149 am: 26554faaf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: I15e56be28fe46471aa63aa123c757bce6512d3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 18:54:06 +00:00
Anton Hansson
09a9c4e3c5 Fix mistake in disting of api txt
When disting into the apistubs/... dir (the "new" path),
the merged api txts are called android.txt rather than
current.txt, to align with all the other <module>.txt.

Also add a new dist goal to build just these files into a
convenient location.

Test: m api_txt dist
Change-Id: I762763cc42b497e00277a8871ef62b0a11423e35
2022-04-08 12:23:51 +01:00
Neha Pattan
2edfc48cb6 Remove *nonpublic_deps which was added pre-Rb announcement.
Bug: 221855066
     21090328
Test: build
      mmm -j packages/modules/Auxiliary
      mmm -j packages/modules/SupplementalApi
Change-Id: If84b882f8bdaee62cfb107c6a079fbc55a012876
2022-03-02 17:40:52 +00:00
Neha Pattan
c62f49fbb2 Merge "(2/3) Remove SupplementalApi from BCP." into tm-dev 2022-03-02 16:22:57 +00:00
Nikita Ioffe
c04cf3c4b9 Merge "Rename supplementalprocess->sdksandbox jars" into tm-dev 2022-03-01 17:08:45 +00:00
paulhu
2a8c2c3601 Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1
Change-Id: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1
2022-03-01 09:41:12 +08:00
Neha Pattan
b091e1e3a7 (2/3) Remove SupplementalApi from BCP.
Bug: 221855066
Test: build
      mmm -j packages/modules/SupplementalProcess
Change-Id: I243ccaa963902351f357c379dd59a6193bee2899
2022-02-28 20:31:31 +00:00
Nikita Ioffe
59029ad151 Rename supplementalprocess->sdksandbox jars
Bug: 220320098
Test: m
Test: presubmit
Test: flashed device, checked BCP and SSCP
Change-Id: Ie1d2aac422f9ffe332f9622b168e908dee874c9e
2022-02-28 18:32:17 +00:00
Roopa Sattiraju
82c71dd74d Merge "Enabling Apex in BT" into tm-dev 2022-02-25 06:30:19 +00:00
Neha Pattan
724e51d9b9 Merge "(1/6) AdServices setup." into tm-dev 2022-02-24 23:49:59 +00:00
Roopa Sattiraju
293ed88b2f Enabling Apex in BT
Bug: 217736913
Test: Compile, bringup and test user journeys
Change-Id: I3e796e3618ad9a077fa5e8ac387e314e896d1051
2022-02-24 20:42:33 +00:00
Neha Pattan
fa46dd2aae (1/6) AdServices setup.
Bug: 219953633
Test: build
      mmm -j packages/modules/AdServices
      mmm -j packages/modules/SupplementalApi
Change-Id: I2fe660daf8f90b41526d946fb66e83aaf9fd1ed0
2022-02-24 16:28:26 +00:00
Anton Hansson
5f6988d7c2 Merge "Expand comment about using a merge api base" am: 0cf86f5a44 am: c36460bc4c am: 4bd4bdf3a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997110

Change-Id: I688d3d23734c9af40502cf3f9e528c7541c0255d
2022-02-24 11:53:01 +00:00
Anton Hansson
0cf86f5a44 Merge "Expand comment about using a merge api base" 2022-02-24 10:32:00 +00:00
Anton Hansson
1e48ea5c6c Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 am: b75c50107c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: I4bda26d3e4d678253f4277fa70544adace07553f
2022-02-23 17:26:48 +00:00
Anton Hansson
ea2c2589ab Merge "Revert "Disable ChangedThrows"" 2022-02-23 15:06:46 +00:00
Anton Hansson
9d34e31877 Expand comment about using a merge api base
A bit more context for the next person looking into improving this
check (it's not straightforward).

Test: No
Change-Id: Ie389bc10dcc307a996dc3a7fad55405fe12a09b9
2022-02-23 11:24:00 +00:00
Anton Hansson
9eadc4611f Revert "Disable ChangedThrows"
This reverts commit 4d6f55f9c1.

Reason for revert: No longer needed
Bug: 217545629

Change-Id: I51978bf3a27a48bec890e044b9989ea46991a9be
2022-02-22 14:08:18 +00:00
paulhu
e074dd2e34 Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1
Change-Id: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1
2022-02-20 15:10:27 +00:00
Sam Gilbert
871a4532d9 Merge "Disable ChangedThrows" am: 65ef5b4d8c am: 2c146ef569 am: 3a23cbc378
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988627

Change-Id: I157a3cec90ab9994d5a45fd17a8429bc7ac35b7a
2022-02-18 05:53:59 +00:00
Sam Gilbert
65ef5b4d8c Merge "Disable ChangedThrows" 2022-02-17 19:04:02 +00:00
Sam Gilbert
4d6f55f9c1 Disable ChangedThrows
Bug: 217545629
Test: build passes
Change-Id: I6cf1fe48f81c414f9709ddf7b117108de4028f22
2022-02-17 10:36:16 -05:00
Frank Wang
e97ff9ebfe Add ondevicepersonalization stubs and bootclasspath fragment
Test: Build
Bug: b/218749359
Change-Id: I651ca865a3215fa2a541636c3af495fdcd4ba8f9
2022-02-13 07:06:31 +00:00
Aurimas Liutikas
0a99c8b1fd Merge "Adding metalava team to OWNERS to be able to disable metalava checks that will break platform build." am: bb3df0c09a am: 99109bf95e am: 85b8a067bf am: 168c7aa892
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973024

Change-Id: I77648762fa1520022e420779e2f76bbbd20f8350
2022-02-08 22:32:11 +00:00
Aurimas Liutikas
bb3df0c09a Merge "Adding metalava team to OWNERS to be able to disable metalava checks that will break platform build." 2022-02-08 21:35:17 +00:00
Sam Gilbert
93fdf4dd29 Adding metalava team to OWNERS to be able to disable metalava checks that will break platform build.
Change-Id: Ie9b32cc3b59eb4059203fed6ade40a2ca0cfee5a
2022-02-07 15:35:03 +00:00
Anton Hansson
95e89a8cb9 Auto-generate list of module impl jars
Eliminate another duplicated list of all modules. This one has a couple
of workarounds due to different naming of impl libs, and bluetooth not
being ready.

Bug: 169103987
Test: m framework-all and diff intermediates (no diffs)
Merged-In: Ia8627c6e3977cd271e389ec482388ff73661881d
Change-Id: Ia8627c6e3977cd271e389ec482388ff73661881d
2022-02-04 16:36:21 +00:00
Anton Hansson
23274eeff5 Auto-generate list of module impl jars
Eliminate another duplicated list of all modules. This one has a couple
of workarounds due to different naming of impl libs, and bluetooth not
being ready.

Bug: 169103987
Test: m framework-all and diff intermediates (no diffs)
Change-Id: Ia8627c6e3977cd271e389ec482388ff73661881d
2022-02-04 11:51:19 +00:00
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