Commit Graph

1485 Commits

Author SHA1 Message Date
Paul Duffin
6872de2560 Merge "Add ike-internals when building framework-all-sources" into rvc-dev-plus-aosp 2020-03-27 09:29:25 +00:00
Yurii Zubrytskyi
dcf91316df Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623
Change-Id: I548982f580dcee4a4494d1fc6215f4d88544f7b0
2020-03-27 07:47:24 +00:00
Yurii Zubrytskyi
a7b10f5623 Merge "Dynamic args complete removal." into rvc-dev 2020-03-27 07:23:55 +00:00
Alex Buynytskyy
686a537376 Dynamic args complete removal.
Bug: b/150470163
Test: atest PackageManagerShellCommandIncrementalTest PackageManagerShellCommandTest
Change-Id: I122f37f210ef9b8b02d565c34245ebeec26d83b2
2020-03-26 16:28:33 -07:00
Artur Satayev
7b0b1e167d Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Merged-In: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
(cherry picked from commit 8612937cb6)
2020-03-26 17:27:14 +00:00
Paul Duffin
c91b0a4907 Add ike-internals when building framework-all-sources
The framework-all-sources filegroup includes sources from ike-srcs
which in turn depends on bouncycastle sources. This change

Bug: 152328618
Test: m droid
Change-Id: Ife5d1b2c80469ee5196d61806b721cf9dae251ed
2020-03-25 19:56:27 +00:00
Automerger Merge Worker
0ad9c8169b Include HexDump in framework-ike-shared-srcs
Bug: 148689509
Test: FrameworksIkeTests, FrameworksNetTests
Change-Id: I6a28a173a6ab0d89c0e80d9e335a15e5e685fa27
Merged-In: I6a28a173a6ab0d89c0e80d9e335a15e5e685fa27
(cherry picked from commit 5b6bb448f2)
2020-03-24 23:06:26 +00:00
Yan Yan
d80894a577 Merge "Include HexDump in framework-ike-shared-srcs" am: a6d47fba4a am: 96aacad6b8
Change-Id: I652c1ea57e87c4a41ca73817956d0aad24a2eef0
2020-03-24 18:10:17 +00:00
Artur Satayev
9a104a759e Remove unsupportedappusage_index.csv from droidcore target.
out/soong/hiddenapi/hiddenapi-index.csv produced by a singleton rule replaced the target.

Test: m
Bug: 145132366
Change-Id: I29267c179f301ebcb128d615229858ced549d670
Merged-In: I29267c179f301ebcb128d615229858ced549d670
(cherry picked from commit e1b9738578)
2020-03-24 17:47:49 +00:00
Yan Yan
a6d47fba4a Merge "Include HexDump in framework-ike-shared-srcs" 2020-03-24 17:30:24 +00:00
Treehugger Robot
a61e6a1e90 Merge changes Idf2c9bd8,Iec48362f am: 31145f453b am: aed7645e62
Change-Id: I59f9733ce935436af6559a9fa2ed28a74b5f3682
2020-03-24 12:00:20 +00:00
Treehugger Robot
31145f453b Merge changes Idf2c9bd8,Iec48362f
* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes
2020-03-24 11:31:33 +00:00
Paul Duffin
c58441f56a Remove unnecessary art.module.api.annotations
Test: m droid
Change-Id: Idf2c9bd8b1cd1cfc573cf84cb1c3a1f8afc07f4b
2020-03-23 21:06:02 +00:00
satayev
cce5cd451a Merge "Remove unsupportedappusage_index.csv from droidcore target." 2020-03-23 19:42:25 +00:00
Xiangyu/Malcolm Chen
abdeaee816 Merge "Remove framework-telephony as it's not used in R." into rvc-dev 2020-03-23 18:47:56 +00:00
Artur Satayev
3e2d34b0c3 Remove unsupportedappusage_index.csv from droidcore target.
out/soong/hiddenapi/hiddenapi-index.csv produced by a singleton rule replaced the target.

Test: m
Bug: 145132366
Change-Id: I29267c179f301ebcb128d615229858ced549d670
Merged-In: I29267c179f301ebcb128d615229858ced549d670
2020-03-23 14:06:43 +00:00
Artur Satayev
cf840b4a65 Merge "Export annotation processor via unsupportedappusage lib." into rvc-dev 2020-03-22 19:47:22 +00:00
Artur Satayev
0f607415db Export annotation processor via unsupportedappusage lib.
Bug: 145132366
Test: diff unsupportedappusage_index.csv
Change-Id: Ic2762ec4eabf6ec6b397d2a3e4fd360e42be566c
Merged-In: Ic2762ec4eabf6ec6b397d2a3e4fd360e42be566c
2020-03-21 13:08:03 +00:00
Xiangyu/Malcolm Chen
6b9429e171 Merge "Move telephony framework sources as part of non-update framework." into rvc-dev am: d961f71778
Change-Id: I37f2d2501058fe3cea50b40ac72dc359d5c7c72b
2020-03-21 00:35:35 +00:00
Xiangyu/Malcolm Chen
d961f71778 Merge "Move telephony framework sources as part of non-update framework." into rvc-dev 2020-03-21 00:20:48 +00:00
Malcolm Chen
bd6d1eaec8 Remove framework-telephony as it's not used in R.
Bug: 151667108
Test: build
Change-Id: Ia9a93b30a2f6b9d8cf464627e3cea3f91f3bfbec
Merged-In: I7ad2eefa854da00845d1d5c2fea596628f092e92
2020-03-20 21:08:49 +00:00
Malcolm Chen
c7991809cb Move telephony framework sources as part of non-update framework.
This allows us to hide Telephony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I7ad2eefa854da00845d1d5c2fea596628f092e92
Merged-In: I7ad2eefa854da00845d1d5c2fea596628f092e92
2020-03-20 21:08:02 +00:00
Anton Hansson
e53bec0567 Remove SDK dep from module_lib_api
This had the consequence of making two large metalava invocations
run in sequence rather than parallell.

For now, add back the dependency on framework-all instead. Building
framework-all should be a lot faster than the sdk stubs.

Also move the module stubs dep from framework_defaults to
framework-minus-apex. framework-all does not need this dep.

Bug: 151092414
Test: m
Test: NINJA_ARGS="-t path out/soong/.intermediates/frameworks/base/module-lib-api-stubs-docs/android_common/module-lib-api-stubs-docs-stubs.srcjar \
                          out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/system-api-stubs-docs-stubs.srcjar" m
Change-Id: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
Merged-In: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
(cherry picked from commit 92d79fddd4)
2020-03-20 11:30:59 +00:00
Anton Hansson
a758a7f1dd Merge "Remove SDK dep from module_lib_api" into rvc-dev am: d3bf9fdefd
Change-Id: I92c7079d321806398e992250efb79c071dcdd335
2020-03-20 11:24:15 +00:00
Anton Hansson
92d79fddd4 Remove SDK dep from module_lib_api
This had the consequence of making two large metalava invocations
run in sequence rather than parallell.

For now, add back the dependency on framework-all instead. Building
framework-all should be a lot faster than the sdk stubs.

Also move the module stubs dep from framework_defaults to
framework-minus-apex. framework-all does not need this dep.

Bug: 151092414
Test: m
Test: NINJA_ARGS="-t path out/soong/.intermediates/frameworks/base/module-lib-api-stubs-docs/android_common/module-lib-api-stubs-docs-stubs.srcjar \
                          out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/system-api-stubs-docs-stubs.srcjar" m
Change-Id: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
2020-03-20 09:24:15 +00:00
Anton Hansson
27d8e28ddb Add individual API tracking files for modules
This adds metalava api tracking generation to the module
stub rules, to make sure we know exactly what API a
particular module stub exports.

Bug: 147768409
Test: m update-api
Exempt-From-Owner-Approval: Approved in master
Change-Id: Iaf2ef5b5751eb208d119ddbc74481239366fe581
Merged-In: Iaf2ef5b5751eb208d119ddbc74481239366fe581
(cherry picked from commit b602b0b2f18d96866a5d7e5d27958af774d1f802)
2020-03-18 13:14:20 +00:00
Anton Hansson
dc033c35c0 Add individual API tracking files for modules
This adds metalava api tracking generation to the module
stub rules, to make sure we know exactly what API a
particular module stub exports.

Bug: 147768409
Test: m update-api
Exempt-From-Owner-Approval: Approved in master
Change-Id: Iaf2ef5b5751eb208d119ddbc74481239366fe581
Merged-In: Iaf2ef5b5751eb208d119ddbc74481239366fe581
2020-03-18 11:03:12 +00:00
Automerger Merge Worker
68ec8449af Remove local text classifier and related tests. am: 293bdf360a
Change-Id: I188e6a23bba966d5081692a7013799b8f145a897
2020-03-17 12:12:19 +00:00
Treehugger Robot
488efe3350 Merge "services.net: Add a static library needed by wifi module" 2020-03-17 09:22:12 +00:00
Anton Hansson
228610294b Merge "Prune framework-all visibility" 2020-03-17 09:11:10 +00:00
Tony Mak
293bdf360a Remove local text classifier and related tests.
1. libtextclassifier and libtextclassifier-java are no longer built
   into framework/base.
2. Removed local text classifier code
3. Removed local text classifier test code.
   All of them should be already moved to libtextclassifier/tcs side.
4. Unify all the TC related log tags to "androidtc".

BUG: 147412216

Test: mts-tradefed run mts-extservices
Test: atest frameworks/base/core/java/android/view/textclassifier
Test: Sanity test: Smart selection

Change-Id: Icb1076153f51d5674c8a6c58681ffed5aa772149
2020-03-16 20:16:17 +00:00
Anton Hansson
5f208a263d Improve consistency of stubs for framework targets
Group all the module stubs together and use them consistently
where needed.

Bug: 151092414
Test: m
Change-Id: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
Merged-In: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
2020-03-16 16:04:31 +00:00
Anton Hansson
cec9266610 Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
Merged-In: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-16 15:54:19 +00:00
Anton Hansson
5b4b699c4f Prune framework-all visibility
IKE doesn't need this anymore.

Bug: 149906971
Test: m
Change-Id: I29bf83efc6f6d906b5d2f3a161623ed8678acf85
Merged-In: I29bf83efc6f6d906b5d2f3a161623ed8678acf85
2020-03-16 15:44:54 +00:00
Roshan Pius
eb7edd5620 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.

Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
Merged-In: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-16 00:23:42 +00:00
Automerger Merge Worker
b241b12f07 Merge "Updated v4 signature processing." into rvc-dev am: 764e7971d8
Change-Id: Iad549b215d4818a0619bb05e75510c5c4c71fd83
2020-03-14 02:35:08 +00:00
TreeHugger Robot
764e7971d8 Merge "Updated v4 signature processing." into rvc-dev 2020-03-14 02:28:40 +00:00
Automerger Merge Worker
65f0b3e810 Merge changes from topic "services.net-wifi" into rvc-dev am: 4d4e926a74
Change-Id: I16a2b101e0d613fcd0d194b42ffb599865632ba9
2020-03-13 22:54:14 +00:00
Roshan Pius
4d4e926a74 Merge changes from topic "services.net-wifi" into rvc-dev
* changes:
  services.net: Add a static library needed by wifi module
  services.net: Use the new ModuleNetworkStackClient
2020-03-13 22:39:09 +00:00
Alex Buynytskyy
f5e605a00c Updated v4 signature processing.
Passing to libincfs.so.
Obtaining and verifying, including v3 digest check.

go/apk-v4-signature-format

Test: atest PackageManagerShellCommandTest
Bug: b/151241461
Change-Id: Id61f5716b9f9b55d6ab1ebca5a7ecb1c6e54570a
2020-03-13 15:13:25 -07:00
Roshan Pius
b6361f9490 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.
b) Add jar-jar rules for all the statically linked dependencies in wifi
service jar rules.

Exempt-From-Owner-Approval: Minor change on top of owner's approval.
Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-13 14:42:09 +00:00
Automerger Merge Worker
6c0344b7ff Merge "Prune framework-all visibility" into rvc-dev am: ba71452e41
Change-Id: I26c5d9bbdd71542ce76bcb7ad679029c48930835
2020-03-13 11:09:30 +00:00
Anton Hansson
00c2785ac4 Prune framework-all visibility
IKE doesn't need this anymore.

Bug: 149906971
Test: m
Change-Id: I29bf83efc6f6d906b5d2f3a161623ed8678acf85
2020-03-12 12:04:11 +00:00
Automerger Merge Worker
5a187253db Merge "Improve consistency of stubs for framework targets" into rvc-dev am: b992b3353b
Change-Id: I0e036c3b8ebf83ab38eec4746b715104a4df6ad7
2020-03-11 20:15:38 +00:00
Automerger Merge Worker
9d879c6e73 Merge "Create all variants of stubs for tethering" into rvc-dev am: b01a5d5e22
Change-Id: I2d0c2b3b453ded7549e6560fc2af99807e7642fc
2020-03-11 10:32:37 +00:00
Anton Hansson
221fe90c62 Improve consistency of stubs for framework targets
Group all the module stubs together and use them consistently
where needed.

Bug: 151092414
Test: m
Change-Id: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
Merged-In: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
2020-03-10 13:13:41 +00:00
Anton Hansson
fe8b04583b Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-10 13:13:36 +00:00
Automerger Merge Worker
02f173032d Merge "Updates based on API council feedback." into rvc-dev am: 16c9fb8c0f
Change-Id: Ie75cfe17f09f5db7d424d921b1408354c224d8b9
2020-03-08 21:08:34 +00:00
Anton Hansson
fce09e2ddd Add visibility to framework-all
Clamp down on framework-all visibility to avoid anyone else
addinga dependency on this problematic library.

Bug: 149928788
Bug: 149906971
Test: m
Change-Id: Ic819b90911220032130c3f8a01b612edd7fa3ecc
Merged-In: Ic819b90911220032130c3f8a01b612edd7fa3ecc
(cherry picked from commit 7c2f73b4ac)
2020-03-07 13:08:32 +00:00
Automerger Merge Worker
a23cea2545 Merge "Uses python3 for fontTools" am: 3cab05992c am: b3ef09e5de
Change-Id: I5de75b9d07bcbfd0e5ddf71023469a7a160115b0
2020-03-07 06:39:28 +00:00