Commit Graph

1520 Commits

Author SHA1 Message Date
Artur Satayev
9f5a5623a7 Export change id processor.
- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
(cherry picked from commit af1a2c4598de7e60b454926e7445caf49e490c76)
2020-03-27 12:12:30 +00:00
Paul Duffin
453ed6a4c2 Merge "Add ike-internals when building framework-all-sources" into rvc-dev-plus-aosp am: 6872de2560 am: 6033bd7f00 am: 7044aafdb0
Change-Id: I56eddbc3e724abc3647831b85bffc8120a72802e
2020-03-27 10:22:35 +00:00
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
bea2e823f6 Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623 am: 4604a9bbe7 am: 082322b5bd am: 22c5d09f92
Change-Id: Iab9be6102f8335f159dcc9f66efb6c19d88c6b8e
2020-03-27 08:37:27 +00:00
Yurii Zubrytskyi
082322b5bd Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623 am: 4604a9bbe7
Change-Id: I9984c6633ab8eadc274c8df8268f374c555f75ee
2020-03-27 08:02:39 +00:00
Yurii Zubrytskyi
4604a9bbe7 Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623
Change-Id: Ia1586861dc98bdbf73570b6230960643c1951877
2020-03-27 07:47:35 +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
Yan Yan
bb61bc93b5 Merge "Include HexDump in framework-ike-shared-srcs" into rvc-dev am: 6d7751e766
Change-Id: I8dbe3324d329392087f3528f45a077eb354bf126
2020-03-26 22:46:22 +00: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
Artur Satayev
fc864b4acf Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
2020-03-26 10:49:22 +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
Alec Mouri
1559ca9889 Merge "Initial boilerplate for an updatable graphics jar" 2020-03-25 17:03:51 +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
Artur Satayev
6e44b5395d Merge "Remove unsupportedappusage_index.csv from droidcore target." into rvc-dev am: ee6e043a0f
Change-Id: I5a8727777bbdfd73e9f9c5cd0452095d2ddb3cf4
2020-03-24 22:55:17 +00:00
Automerger Merge Worker
5b6bb448f2 Merge "Merge "Include HexDump in framework-ike-shared-srcs" am: a6d47fba4a am: 96aacad6b8 am: d80894a577" into rvc-d1-dev-plus-aosp am: 9c557de782 am: da63e68649
Change-Id: I6e4d13e4c4bcae6ca34cdbb78297435e542ca7dd
2020-03-24 18:55:38 +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
bb3fd381ef Merge changes Idf2c9bd8,Iec48362f am: 31145f453b am: aed7645e62 am: a61e6a1e90 am: eddc6e0074 am: 994beb2ca9
Change-Id: I4ed59558732ea41d3d51c352d712919259d403cd
2020-03-24 12:36:26 +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
Malcolm Chen
64f666a3be Remove commented telephony-framework definition.
Bug: 151667108
Test: build
Change-Id: I418584cb450157c4eca1156eeb9c9cc657881c1b
2020-03-23 12:51:29 -07: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
Malcolm Chen
fbc5c36e86 Move telephony framework sources as part of non-update framework.
This allows us to hide Telehony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I7ad2eefa854da00845d1d5c2fea596628f092e92
2020-03-20 17:41:09 +00:00
Anton Hansson
571bb0b45e Merge "Remove SDK dep from module_lib_api" into rvc-dev am: d3bf9fdefd am: ca18147bfb am: 0ec6be57d4 am: bdf9857e7d
Change-Id: Iafaffa24a580414a2606f9df903485b5921fd6cc
2020-03-20 11:53:15 +00:00
Anton Hansson
0ec6be57d4 Merge "Remove SDK dep from module_lib_api" into rvc-dev am: d3bf9fdefd am: ca18147bfb
Change-Id: Ic3b2f00dfc341adbf01ca92ba5a7362eeeb87f8a
2020-03-20 11:37:44 +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
Alec Mouri
ef37c24f44 Initial boilerplate for an updatable graphics jar
Bug: 149773383
Test: builds
Test: hacks to verify that @hide apis are actually two-way hidden
Change-Id: I148b54fe47560b2335e9d878ed93bf167d6c7517
2020-03-18 19:50:27 +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
Anton Hansson
bb61f963e3 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 check-api
Exempt-From-Owner-Approval: rebase + m update-api
Change-Id: Iaf2ef5b5751eb208d119ddbc74481239366fe581
2020-03-18 11:00:09 +00:00
Automerger Merge Worker
0905864d4e Remove local text classifier and related tests. am: 293bdf360a am: e94d4b04bc am: bc20f5c39b am: 1d304860eb
Change-Id: I8e8f69e0b3b29cce752ad320f988ef70dc96333e
2020-03-17 16:23:55 +00:00
Automerger Merge Worker
bc20f5c39b Remove local text classifier and related tests. am: 293bdf360a am: e94d4b04bc
Change-Id: I7ca571e879d61b0c76d0a2424fcfb91b06be5d74
2020-03-17 12:30:34 +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