The annotations in srcs aren't doing anything because they are all
@hide. The only thing keeping hwbinder-stubs-docs compiling is
a hack in metalava that treats anything with
hwbinder-stubs-docs-stubs.srcjar.rsp in its input files as
effectively having annotations_enabled: false.
Remove the unnecessry srcs, and add stub-annotations, which contains
a stub definition for android.annotation.NonNull, to hwbinder.stubs.
None of the rest of the annotations in srcs are used in the
generated stubs.
Test: m hwbinder.stubs
Change-Id: I7ec9afb41ea9617f25d1dffd3382fed90997b751
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.
This allows moving the connectivity code in/out of APEX with minimal
changes.
BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API
Bug: 171540887
Test: device boots, connectivity working
Merged-In: I21c42f032efa6c10e36c749df3183ce9679303a7
(cherry-pick from internal branch with API files conflicts)
Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.
Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
Merged-In: I10759d22eaba4861b7d7f283b551156f09f54675
...in order to be able to resolve IKE classes. Note that this can be
removed once the prebuilt stub in prebuilts/sdk contains IKE, which
can be achieved with a new import after this CL is submitted:
I10759d22eaba4861b7d7f283b551156f09f54675
Bug: 177266501
Test: m
Change-Id: I7229b1486e7170acca5da8f1b7874e5eaaecb1db
The previous incompatibilities genrule targets have been replaced
by targets auto-generated by prebuilt_sdks.
The intentention of this change is to eventually have per-jar file
incompatibilities tracking, but this change does not change the
underlying file used, only switching to the new target.
Bug: 178171189
Test: m
Change-Id: Ib5a2be7d53e3576d92db4c843f1fca829b9bfc6d
Add disting of the following for the sdk:
- android-non-updatable.txt
- android-non-updatable-removed.txt
- removed.txt
Bug: 158544979
Test: m sdk dist && inspect out/dist/apistubs
Change-Id: I5f628f4fcfc13f67105ee3b2760274e900fc1e34
Stop tracking the ART APIs in the non-updatable current.txt, and
instead add in the txt/srcjar/jar files produced by the art module's
java_sdk_library.
Bug: 173606718
Test: manual last_released check of merged api txt (b/174847574 to
automate)
Change-Id: I446a381f2b364a114ce391b99a13742d6769f14d
These were used temporarily before merged stubs were ready,
but they are not used anymore.
Test: m
Change-Id: I517f64353749ffd8d92b8ddbc1dd8b7af75f2176
We're working on moving the libcore classes away from srcs and into the
classpath, and ignoring classes on the classpath will cause incorrect
API signatures once that happens (several libcore classes appear in
public API signatures).
Keep the docs building in the same way they were before. They will be
addressed in separate CLs.
Bug: 173606718
Test: m checkapi
Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.
The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.
The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.
Bug: 174344410
Test: m offline-sdk-docs
- check that i18n classes are present
m android_stubs_current android_system_stubs_current android_test_stubs_current
- check that i18n classes are present in each jar
m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
Add indication APIs to expose Quality Of Service (QOS) information
from LTE and NR default as well as dedicated bearers. The QOS is
added to the existing SetupDataCallResult structure so that the
baseband can notify whenever there is a change in QoS on a PDN.
Bug: 158315614
Test: 1) Simulated V1_6 SetupDataCallResult and verified the Qos objects
are passed correctly in the APIs
2) atest frameworks/opt/telephony/tests/telephonytests/
Merged-In: I29b13975288286d9706a1c3fb227eeb46527efc3
Change-Id: I29b13975288286d9706a1c3fb227eeb46527efc3
The change I41b38d4828f8dc5d90dbb3ae59462812b8c036f2 accidentally
started disting the public android.jar to the path where the system
android.jar is expected.
Move the dist rules from the public stubs to the system stubs where
they belong.
Bug: 172937217
Test: m sdk dist && \
zipinfo out/dist/apistubs/android/system/android.jar | \
fgrep telecom/Phone.class
Change-Id: If20cb4ec32e1eb631a824ecc180d33c5088ff7c8
- Merge the "full" defaults into the "base" defaults (base wasn't used)
- Reword some comments
- Fix double mention of priv_apps @SystemApi annotation in a droidstub
Test: m checkapi
Change-Id: Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6
Merged-In: Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6
Remove the build rule for updating api/current.txt and other files,
which makes it easier to remove the txt files themselves.
Bug: 171029603
Test: m nothing
Change-Id: I987fd9f6075d0f7c6817f16bf7282c6239afb7db
Nothing consumes the output of this module anymore. The txt files
themselves will be removed in a follow-up change (it is easier after
this build rule stops them changing all the time).
Bug: 171029603
Test: m checkapi with txts removed
Change-Id: Iac487dd6c62504b33cf4e372ba4a7cf9808bf5fc
The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.
Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
(cherry picked from commit 3a1b1bd620454dd1d5b328c98634a567865cd55e)
Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.
Rename the merged variants instead of having duplicate compilation
rules.
Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
Merged-In: I7859589b93b861439fb1b7de084e52294da53671
This achieves two things:
- it's been noted that non-updatable-api is a confusing term as it has
to be updated every time the API changes
- the api-review logic trigers on txt files in subdirs named 'api',
which non-updatable-api does not trigger on
I will (less urgently) try to get rid of the term "non-updatable" from
other places too, perhaps going for "non-module" or "core" as a
replacement.
Bug: 171029603
Test: m checkapi
Change-Id: I843efb4880b6caaf3872e9b0918fd710fb93d979
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
This target existed just to track the "full" module lib API surface,
until the individual pieces had the same standards. However, now:
- the full current.txt file is available as a build target
- all the individual .txt files are API reviewed, checked against
last api, linted, and changes result on API council bug updates
The .txt files will be removed in a separate CL.
Bug: 171029603
Test: m checkapi
Change-Id: Ib8ec547871045f77fb73aa82f192b5a7767d0c33
Previously all droidstubs modules were classified as highmem. Annotate
only the huge modules as such, to allow more parallelization of lowmem
droidstubs modules.
Bug: 170701554
Test: NINJA_HIGHMEM_NUM_JOBS=3 m checkapi
Change-Id: I83ae88222110d7afe4009076e951c88a5188ca83
This makes it impossible to add new @TestApi in modules, of which
there are none right now and we don't want any going forwards, either.
Bug: 170395679
Test: m test-api-stubs-docs-check-current-api
Change-Id: I527ca7b580350372bee72b65f6596a46eab2ce04
Merged-In: I527ca7b580350372bee72b65f6596a46eab2ce04
Nothing uses these outputs anymore. The compat tools have been
migrated to use a new file in I082d18fc2b8a57ea8c5941d5c955a7970ab9d860.
Bug: 158465496
Test: presubmit
Change-Id: I51a1f3f5e43092f5431358d705379cc33b60b835
Include @SystemApi APIs in the test_current stub jar, while keeping
the @TestApi and @SystemApi API txt files tracked separately.
A side-effect of this change is that string constants of @SystemApi
permissions are no longer inlined in the test api tracking, possibly
because metalava was previously incorrectly peeking at @SystemApi
whereas it is now explicitly forbidden to do so. I don't believe the
API txt change has any practical effects.
Bug: 129133308
Test: presubmit
Change-Id: I23d3c88624ee7599485c3390a0440b78bc18a0a2
Merged-In: I23d3c88624ee7599485c3390a0440b78bc18a0a2
The official API differences report is not produced from the
artifacts this rule creates, but by manually running metalava
with the right txt files.
As there are no other known users of these jdiff files, remove them
for now.
Bug: 158465496
Test: m
Change-Id: Iee9dd1a5d5543f3f629e3631c8224e6bfe4dddcb
I missed this in If608be48276f0a7f76afd714656267ed379ce062, which added
last_released tracking to the other *-non-updatable APIs. See that
change for more context.
Bug: 170105267
Test: m checkapi
Change-Id: I32d09c7fc155c04295dc16028a568e3381c09e4b
This makes the build fail when APIs are removed from the (non-updatable)
framework.jar, and e.g. into a module. This is in general not safe, so
is a reasonable default. When it needs overriding (when e.g. creating
now modules), incompatibilities.txt can be used for that.
Bug: 170105267
Test: m checkapi
Change-Id: If608be48276f0a7f76afd714656267ed379ce062
Merged-In: If608be48276f0a7f76afd714656267ed379ce062
The stub libraries had a dependency to framework-internal-util which is
a collection of java static libraries whose source code is
auto-genmerated (e.g. via protoc, aidl, etc.)
The library was added as a dependency because some Java files that are
fed into the metalava for the stub code generation have references to
some of the auto-generated symbols. However, this is more than
necessary. Furthermore, that setup will create a circular dependency
when framework-internal-utils (or its transitive dependencies) have a
dependency to the stub libraries due to 'sdk_version' setting.
Fixing the problem by replacing the dependency to
framework-internal-util with a few number of libraries.
Bug: 169618843
Test: m
Change-Id: I30c953ed220e84ab295548845fff0b26e3c060b6
Bug: 168301990
Test: Built offline-sdk-docs with and without the change and
diffed them. There were some changes other than the timestamp.js
file. With these changes classes that implemented the
Object.equals(Object) method had some extra documentation that
explained that the parameter could be null. The reason for this
change is that the stubs generated with this change includes
android.annotation.Nullable whereas previously they included
androidx.annotation.Nullable. The change is a very minor
improvement over what is currently uploaded to
developer.android.com/reference so not worth backporting.
Diffed api/public/current.txt against
frameworks/base/api/current.txt and made sure that the latter was
a superset of the former and there were no differences in the area
that overlapped.
Change-Id: I3767948b4659b18b813c8eed66258af98ac4a241
This adds stub generation for the non-updatable part of the platform,
and changes the full stub jars to be a combination of multiple jars:
the stubs of the updatable modules and the stubs of the remaining part
of the platform.
Composing the stub jars like this allows overriding the individual parts
with prebuilts rather than building everything from source. This makes
the build safer, as we can make sure that the stub of the apex that is
used is also what is used to build the rest of the platform against.
The monolithic droidstubs rules remain for now, as it has other
functions than generating stub sources (api lint, current.txt,
checklast). It remains a goal to get rid of this, but by submitting this
CL first it can be done in steps.
Bug: 144149403
Test: m android{,_system}_{monolith,merged}_stubs_current
Test: m
Change-Id: I255486112c03f237aa342cfb93f3b473a2f50470
Merged-In: I255486112c03f237aa342cfb93f3b473a2f50470
(cherry picked from commit 3c1b15a3dea5486b57d3bf1d60a7b7170494274e)
The android.jar stubs includes the resource from framework-res. This
dependency was previously added implicitly inside the build system, but
using a java_genrule we can add it directly, which makes it easier to
make changes to this rule.
This change has the side-effect of adding the resources to some stubs
that did not previously include the resources (e.g. module-libs), which
I think is desired.
Bug: 161214753
Test: build sdk, diff out/dist before and after (shows resources added
to some stubs)
Change-Id: I1829789af207cc45c49c0c68369fc7c0c085bcb0
Merged-In: I1829789af207cc45c49c0c68369fc7c0c085bcb0
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.
Bug: 161214753
Test: diff results of `m sdk dist`
Merged-In: Id54507e297b5c57d1ce58f14eb347e7661a5328d
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
Reason for revert: breaking several builds downstream
Reverted Changes:
Ia5767debc:Enable metalava sandbox in StubLibraries.bp and Ap...
I7256d29f1:Add sandbox property to the javadoc rule.
Ia69440800:Only report a violation when the file exists.
Change-Id: I5651212314fd39b7ba404936dee416f566c682c9
