1644 Commits

Author SHA1 Message Date
Janis Danisevskis
84e082d3da Keystore 2.0: Renaming the vpnstore interface.
Renaming the vpnstore interface to legacykeystore.

Bug: 190229655
Test: TBD
Merged-In: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
2021-06-30 12:29:29 -07:00
Yan Yan
e2a58ab718 Merge "Include WakeupMessage in framework-ike-shared-srcs" 2021-06-17 22:04:26 +00:00
Harry Zhang
b4befa4537 Create platformtestprotos.
This target contains some proto definitions used by TradeFed. TF will
use this instead of platformprotos to reduce proto dependencies on the
platform.

A separate build file is created so its ownership is managed separately.
The OWNERS file will be updated due to merge conflicts.

Bug: 181921006
Test: New target builds.
Change-Id: I87e7a73d1160e3cf56a4c013e74989cdc90e1211
Merged-In: I82386a6c8a5e6ddf42d8377148001f4ede2f297f
2021-06-11 14:12:53 -07:00
Yan Yan
e7a360f7ff Include WakeupMessage in framework-ike-shared-srcs
Bug: 180653278
Test: make
Change-Id: I3d7d789ab6f71ece64318e5aff74f7f739e2b2c0
2021-06-10 18:45:39 -07:00
Remi NGUYEN VAN
fc729f02e9 Merge framework-connectivity impl and stub targets
Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Bug: 183600168
Test: m
Merged-In: I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165
Change-Id: Icfe492943308ad35069b94a07d3cf80498739b66
2021-06-01 18:31:23 +09:00
Anton Hansson
df4b33036d Add some warnings and notes about framework's jarjar rules
These rules are explicitly recommended  to be depended on by other
libraries in the bootclasspath, that may depend on the framework's
copy of the hidl library.

Bug: 186804505
Test: presubmit
Merged-In: I09766423782d9bb9408f3d14169d7e5d8f1b5823
Change-Id: I09766423782d9bb9408f3d14169d7e5d8f1b5823
(cherry picked from commit 524bf249777f5e71d22facb9ddd86d58abab651a)
2021-05-26 17:03:21 +01:00
Anton Hansson
766605521e Merge "Revert "Inline usage of jarjar_rules.txt"" 2021-05-26 13:57:11 +00:00
Anton Hansson
637b1d65e2 Revert "Inline usage of jarjar_rules.txt"
This reverts commit 1461c6ef55acc8d2c28fc767cf566d7437a4879c.

Reason for revert: b/186804505
Bug: 186804505
Test: presubmit
Merged-In: I055f4075ac7728dfed5877286624a9600c90a38f
Change-Id: Ie1f100883c3ad6bb6f2f9a308647e4e5268b02d5
2021-05-25 16:56:48 +00:00
Baligh Uddin
940801c165 Remove packages/Connectivity
It has moved to packages/modules/Connectivity

BUG: 186628461
TEST: TH
Merged-In: I2ed1fb00a7780c488c40d27590f206031fe033f2
Merged-In: I2a7a181e65be8952f8044df845efa80b6134d416
Change-Id: I8d162386289fcd4dc5e7092c3ea836fb67641e9f
2021-05-24 05:41:51 +00:00
Anton Hansson
46dff8e09f Merge "Apply the same filtering for docstubs and jarstubs" 2021-05-11 11:24:14 +00:00
Anton Hansson
dbf1544b68 Merge "Inline two constants from CorePlatform" 2021-05-11 09:00:57 +00:00
Anton Hansson
76ac4cc96f Apply the same filtering for docstubs and jarstubs
A package filter was previously applied to just the jarstubs package,
but not the docstubs. This lead to various internal classes appearing in
the public documentation. Fix that to apply the same filter for both.

This removes the following classes from the docs:
    android/telephony/PackageChangeReceiver
    com/android/net/module/util/CollectionUtils
    com/android/net/module/util/ConnectivityUtils
    com/android/net/module/util/NetworkCapabilitiesUtils
    com/android/net/module/util/NetworkIdentityUtils
    com/google/android/collect/Lists
    com/google/android/collect/Maps
    com/google/android/collect/Sets
    com/google/android/gles_jni/EGLConfigImpl
    com/google/android/gles_jni/EGLContextImpl
    com/google/android/gles_jni/EGLDisplayImpl
    com/google/android/gles_jni/EGLImpl
    com/google/android/gles_jni/EGLSurfaceImpl
    com/google/android/gles_jni/GLImpl
    com/google/android/util/AbstractMessageParser
    com/google/android/util/AbstractMessageParser$Acronym
    com/google/android/util/AbstractMessageParser$FlickrPhoto
    com/google/android/util/AbstractMessageParser$Format
    com/google/android/util/AbstractMessageParser$Html
    com/google/android/util/AbstractMessageParser$Link
    com/google/android/util/AbstractMessageParser$MusicTrack
    com/google/android/util/AbstractMessageParser$Part
    com/google/android/util/AbstractMessageParser$Photo
    com/google/android/util/AbstractMessageParser$Resources
    com/google/android/util/AbstractMessageParser$Smiley
    com/google/android/util/AbstractMessageParser$Token
    com/google/android/util/AbstractMessageParser$Token$Type
    com/google/android/util/AbstractMessageParser$TrieNode
    com/google/android/util/AbstractMessageParser$Video
    com/google/android/util/AbstractMessageParser$YouTubeVideo
    com/google/android/util/Procedure
    com/google/android/util/SmileyParser
    com/google/android/util/SmileyResources

Bug: 187386774
Test: diff framework-doc-stubs/../api-versions.xml before and after
Change-Id: I85b1485b4c5bc1b30a5d537e96d961382f298fb7
2021-05-10 17:06:04 +01:00
Anton Hansson
4e86dcad12 Inline two constants from CorePlatform
Inlining these constants allow the public api metalava run to depend on
ART's public API rather than the "internal" CorePlatform API, which
prevents picking up unintentional classes (such as annotations) from the
CorePlatform API in the public stubs.

Because these constants get inlined in the API/stubs, and the constants
have been finalized for many years, they can never change. Because they
cannot change, reusing the constant is of limited value. I've added
some comments to point readers to other places the constant is used.

Bug: 154796679
Test: m checkapi
Change-Id: I0b347a2964cfe5a1206145fdc56934727b890469
2021-05-10 10:28:02 +01:00
Anton Hansson
ee95f486e5 Merge "Add targets to build doc-stubs for non-updatable" 2021-05-10 08:55:07 +00:00
Treehugger Robot
3736d7ac1b Merge "Call apexd's API to allocate space before install non-AB package" 2021-05-08 21:44:57 +00:00
Anton Hansson
c7f5e7d439 Add targets to build doc-stubs for non-updatable
Like the jar stubs, the doc stubs need modularization to avoid depending
on module sources and instead being assembled by merging the doc stubs
of the constituent modules. This will allow generating e.g. the lint
database, annotation zips, and the documentation itself from prebuilts
(which in turn allows mixing e.g. non-updatable R with the latest
modules).

Move the defaults for the non-updatable jar stubs to the shared bp file
and reuse it for the non-updatable doc stubs, and add two targets for
the public and the system stubs.

Bug: 186197911
Test: m android-non-updatable-doc-stubs{,-system}
Merged-In: Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d
Change-Id: Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d
2021-05-07 13:51:28 +01:00
Kelvin Zhang
a48c18e3df Call apexd's API to allocate space before install non-AB package
When installing a non-AB package, if the OS comtains compressed apexes,
we need to allocate space for these apexes so that they can be properly
decompressed on the next reboot.

Test: adb shell cmd recovery install-package /data/ota_package.zip
Change-Id: Ia40d0614e0e724cfb17e91720ec88a15795bd8ee
2021-05-04 15:07:56 -04:00
Baligh Uddin
3b92756733 Remove annotations that have been relocated
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: TH
Merged-In: I024252070bd806d50d54377190fdc5cd5b4445e1
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
2021-05-01 18:56:12 +00:00
Anton Hansson
1461c6ef55 Inline usage of jarjar_rules.txt
No need to have a filegroup for this. This also has the nice side-effect
of avoiding modules outside this directory depending on the file.

Bug: 185128417
Test: m
Merged-In: Idef6f2fd89116490c43427bba55202f46377a83d
Change-Id: Idef6f2fd89116490c43427bba55202f46377a83d
2021-04-12 18:38:55 +01:00
Anton Hansson
92b6c725b0 Move framework proto build rules to separate file
The proto build rules are quite large and makes the top-level Android.bp
file difficult to navigate. Move them to a separate file.

Bug: 185128417
Test: m
Merged-In: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
Change-Id: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
2021-04-12 18:38:42 +01:00
Anton Hansson
702aa95096 Move font tool build rules to subdir
The top-level Android.bp file is very large, so move modules that can be
in subdirs.

Also rename the vague "base_defaults" module to something more suitable.

Bug: 185128417
Test: m
Merged-In: I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b
Change-Id: I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b
2021-04-12 17:57:51 +01:00
Anton Hansson
84918d5674 Move build modules from top-level to core/java/
The top-level Android.bp is large and difficult to navigate. Move rules
that don't have any "top level" things in them down in the core/java
directory.

Bug: 185128417
Test: m
Merged-In: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
Change-Id: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
2021-04-12 17:57:38 +01:00
Paul Duffin
9f82ba21f1 Merge "Remove framework-atb-backward-compatibility" 2021-04-06 14:09:30 +00:00
Anton Hansson
1bf83b28d9 Merge "Remove hwbinder" 2021-04-06 13:08:56 +00:00
Paul Duffin
20c056dacb Remove framework-atb-backward-compatibility
The class in this library no longer needs to be conditionally included
on the bootclasspath based on the REMOVE_ATB_FROM_BCP flag so is being
built as part of framework-minus-apex.

Bug: 184331423
Test: m nothing
Change-Id: If7c2ec51be0670ffda22e18ce1e028783a1513e7
2021-04-06 11:41:49 +01:00
Janis Danisevskis
a6dcf091f5 Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
2021-04-01 17:06:41 -07:00
Steven Moreland
bd32be9d25 Merge "Partial: ActivityManager: use proc state from compiled aidl" 2021-04-01 18:33:54 +00:00
Steven Moreland
42c6e93fde Partial: ActivityManager: use proc state from compiled aidl
In order to fix divergence in libbinder Android.bp file, adding an
empty file group corresponding to an internal file group.

This is needed to easily manipulate where source files are included
in libbinder without having to land patches internally and externally.

Bug: 183654927
Test: N/A

Merged-In: I3dafe7a75b2dae561583a7821284027a1896b9a5
Change-Id: I8821242efdc0a27daddf30368f948855062f2d14
2021-04-01 18:30:28 +00:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Anton Hansson
4199ef90b9 Merge changes I97086e30,Ic55df4cf,I81a08c29
* changes:
  Move framework java filegroups into subdirectories
  Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
  Partial cp of "Initial boilerplate for an updatable graphics jar"
2021-03-31 16:13:13 +00:00
Anton Hansson
9a7ad7fa85 Merge "Delete framework-updatable-sources filegroup" 2021-03-31 14:33:20 +00:00
Anton Hansson
703cde0322 Delete framework-updatable-sources filegroup
Inline these sources in the only place it is used.

Test: presubmit
Merged-In: I42e7044471262bf901b8c130a50e1a8a8170c600
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
2021-03-31 13:16:11 +00:00
Anton Hansson
355f8c28b1 Merge "Remove custom annotation libs" 2021-03-31 09:20:54 +00:00
Anton Hansson
f5c654654d Remove custom annotation libs
Various modules were previously creating their own annotation libs
as some appeared to be missing from framework-annotations-lib. Add the
missing ones instead (they all have SOURCE retention), and delete the
custom ones.

Bug: 183133670
Test: m
Merged-In: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
Change-Id: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
2021-03-30 16:18:49 +01:00
Anton Hansson
c11a1cba0a Remove hwbinder
Noone uses this.

Bug: 77285514
Test: m
Change-Id: Ia6903ee91011b9bb5d8765e2534737da1d6ac45c
2021-03-30 13:21:08 +01:00
Anton Hansson
9b2c4a650b Move framework java filegroups into subdirectories
All the java code used to build the framework jar and run metalava
was previously defined in the toplevel Android.bp files. Move these
into the subdirs where the source actually lives.

This simplifies the rules themselves (no path and needless prefix) and
declutters the top level Android.bp.

Test: m
Change-Id: I97086e309eacb879d16facb8497d9940fa5ddaf6
2021-03-30 12:26:55 +01:00
Anton Hansson
459d9506ee Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
Cherry-pick the change to the media filegroup in the root Android.bp
to avoid merge conflicts in upcoming changes.

Test: m nothing
Merged-In: I46acdd2f118d5b082aa162c680661a304b4f628b
Change-Id: Ic55df4cfeb295cfa1657c64f9747c90e30cb73a2
2021-03-30 12:21:21 +01:00
Anton Hansson
fbb283fb4d Partial cp of "Initial boilerplate for an updatable graphics jar"
Rename the filegroup for graphics was was done in the internal change
I148b54fe47560b2335e9d878ed93bf167d6c7517.

Test: m nothing
Merged-In: I148b54fe47560b2335e9d878ed93bf167d6c7517
Change-Id: I81a08c29ca99568101f31dc74f8c9d4d5d65663e
2021-03-30 12:09:53 +01:00
Anton Hansson
a08dc6905f Add framework-mime-sources to stubs generation
It was used in the docs stubs generation but it doesn't have its own
(jar) stub generation. Add it to the shared non-updatable sources for
consistency.

The only class in these sources is @hide, so it makes no
immediate difference.

Test: diff android_stubs_current artifact before/after
Change-Id: I33e75623d8d71da362fb16befb78c8c7596fa400
2021-03-30 10:45:27 +01:00
Anton Hansson
77ff72fd71 Add a shared filegroup for non-updatable stub sources
It is always a mistake to add something to the stub sources but not
the doc stub sources.

Test: m
Change-Id: I6b76f5d2c7f0adc01b8a9eb141f2f34d9c2d2967
2021-03-30 10:45:27 +01:00
Anton Hansson
6f1d267633 Remove framework-aidl-mappings
Only used on-demand by potential future app-compat LSCs. We can add it
back if it is needed.

Remove the now unused framework-all-sources at the same time (yay!!).

Bug: 149906971
Test: m
Change-Id: I61176f48d6b90b47f4b9c348e0686111fb704a77
2021-03-30 10:24:33 +01:00
Steven Moreland
8bb6bc2716 split packagemanager_aidl from libbinder_aidl
This filegroup contains libbinder things plus packagemanager things.
Ideally this packagemanager dependency should only be taken by the
things that need it since libbinder is loaded by very many processes,
and it may consider to dirty memory in these processes (the vtables for
AIDL interfaces). This is a preparation CL.

Bug: 183654927
Test: N/A
Change-Id: Iba8153a50244101875fcfd1148924430c0907b37
2021-03-26 01:51:47 +00:00
Paul Duffin
82cd5382b7 Merge "Remove unnecessary dependency on libcore-platform-compat-config" 2021-03-23 11:17:06 +00:00
Janis Danisevskis
15212609ca Use source for keystore/keymint interfaces.
This patch makes frameworks use generated sources instead of libraries
for keystore, keymint and related interfaces and dependencies to break
circular build system dependencies occuring when using @SensitiveData
annotations.

Bug: 174857732
Bug: 176110256
Test: N/A
Merged-In: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
Change-Id: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
2021-03-22 18:26:16 +00:00
Paul Duffin
c130918e25 Remove unnecessary dependency on libcore-platform-compat-config
Bug: 182402754
Test: m droid
Change-Id: I2d8558acf2d61452e1994259dd05a15b2252e577
2021-03-22 08:39:06 +00:00
Remi NGUYEN VAN
c538773be1 Merge "Create a service-connectivity-pre-jarjar library" 2021-03-15 01:32:47 +00:00
Treehugger Robot
721f75ec5a Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" 2021-03-11 11:20:11 +00:00
Aaron Huang
0353bb9da4 Create a service-connectivity-pre-jarjar library
This is needed for FrameworksNetTests because it inculdes
service-connectivity. Without this library, the service-connectivity
is already jarjar-ed which will cause the util classes couldn't be
found when running the tests. So let the tests inculde the pre-jarjar
version and service-connectivity applies the jarjar to this library.

Bug: 177046265
Test: FrameworksNetTests
Change-Id: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca
Merged-In: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca
2021-03-10 22:25:45 +08:00
Bram Bonné
d5b27fd3eb Merge "Build Rust bindings for PermissionController" 2021-03-09 14:35:06 +00:00