Commit Graph

269 Commits

Author SHA1 Message Date
Nan Zhang
520267b93f Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065
am: b910944852

Change-Id: I41e110dee813021552fee125ddbcbdbaba2d6703
2018-09-12 15:08:04 -07:00
Nan Zhang
894c9ec583 For metalava target, use droidstubs instead of droiddoc
droidstubs is used to generate stubs files only.

Test: m -j api-stubs-docs
Bug: b/8d0763849
Change-Id: Ia7c3d19ed2ec7b0f5b96008e5780dbcd5a32402b
2018-09-11 15:41:50 -07:00
Treehugger Robot
f4fc71f370 Merge "Build android.test.* with java_sdk_library" 2018-09-07 01:01:59 +00:00
Mathew Inwood
d20588332d Merge "Processor for @UnsupportedAppUsage annotations." am: e5440456ca
am: 22ea0b7a52

Change-Id: I0fd41ccc78872eae55e8341a8a38d6c6b39e0114
2018-09-05 09:43:35 -07:00
Mathew Inwood
bad89e5e5b Processor for @UnsupportedAppUsage annotations.
The processor outputs unsupportedappusage_index.csv, containing source
position info for every@UnsupportedAppUsage annotation processed. It is a
mapping of dex signature to the source postion of the annotation on that
signature. It is used as input for scripts which update the annotations.

We include a META-INF file which causes the compiler to automatically
pick up the annotation processor. Otherwise we would need to explicitly
specify the processor with a -processor flag to javac.

We create a new build target for just the @UnsupportedAppUsage annotation
and the @IntDef annotation (which it depends on) so that the processor can
also depend on that directly.

The processor only runs on a new build target framework-annotation-proc
so that it is not invoked as part of a regular build. This is done so
that we don't slow down peoples builds: Soong does not support annotation
processors when javac sharding is in use. This workaround can be removed
once b/77284273 is fixed.

Test: m framework-annotation-proc
Bug: 113853502

Change-Id: Ie9cd5a90ddf7a51f6035e849703fc39ad9127557
2018-09-05 15:01:21 +01:00
TreeHugger Robot
0df9368b0f Merge "Build android.test.* with java_sdk_library" into pi-dev-plus-aosp 2018-09-03 01:06:33 +00:00
sqian
1b4f1de0a7 Merge "Call Redirection Surface in Telecom out going call flow" am: 11486bfab2
am: 54016bdbca

Change-Id: I30adaf5566a55aa867f859b42a49bbbfb0b8d651
2018-08-31 18:04:17 -07:00
sqian
cae1f264b9 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
Merged-In: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
(cherry picked from commit ea8970cd55)
2018-08-31 12:59:40 -07:00
Nan Zhang
af2513048e [Vendor] Add filegrouop for NonNull.java
This is needed by google.camera.experimental docs.

Test: m -j docs
Bug: b/70351683

Change-Id: I79b3f0946a1d606cda770eabe7c287f4cc207bfc
2018-08-30 14:53:06 -07:00
Sundong Ahn
63a6a00f44 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
(cherry picked from commit f24779c8c7)
2018-08-29 16:22:00 +09:00
Sundong Ahn
e933cedf83 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
2018-08-29 12:22:59 +09:00
Nan Zhang
a17beeb779 [java9] Convert hiddenapi-list target to Metalava
This blocks how we try java9 for droiddoc since "hiddenapi-lists-docs"
targets depends on libcore sources. So migrate this target to Metalava.

Test: m -j hiddenapi-lists-docs
Bug: b/78245848
Change-Id: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
Merged-In: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
2018-08-23 15:35:33 -07:00
Treehugger Robot
c9b01b87b1 Merge "Add compatibility check for (system|test_)api-stubs-docs" 2018-08-23 07:33:31 +00:00
Jack Yu
63de9eabec Merge "Added qualified networks services" 2018-08-22 20:18:11 +00:00
Jack Yu
a3ab5750a4 Added qualified networks services
Added the qualified networks service, which is a base
class for vendor's qualified network service to extend.
The service is to update frameworks the available
networks for data setup for each APN type.

Test: Manual
Bug: 73659459
Change-Id: I7238aeac8e48be2a17245de77239b242703bcb7e
2018-08-21 17:57:57 -07:00
Nan Zhang
cd060d9808 Add compatibility check for (system|test_)api-stubs-docs
Test: m -j api-stubs-docs
Bug: b/78245848
Change-Id: Ia4a337ac464232ac8a5bd054b940a7d7f1f4e213
2018-08-21 10:39:42 -07:00
Pete Gillin
8ab61fb0dd Merge "Stop reading the generated ojluni sources in droiddoc." 2018-08-21 15:14:55 +00:00
Colin Cross
432141676a Convert platformprotosnano and platformprotoslite to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Icfb0001df2e35b5ed799511ff4f2f563d626134b
2018-08-20 13:57:24 -07:00
Pete Gillin
d41686cea5 Stop reading the generated ojluni sources in droiddoc.
These sources contain the result of applying the annotations from
ojluni.jaif to the ojluni sources. Now that ojluni.jaif is empty, this
is a noop, so this change switches back to reading the original
sources.

Bug: 111639530
Test: `make docs` is not affected
Change-Id: Idb98aa4f054a11bfcbcb8a84dd6f357a0a025c49
2018-08-20 17:33:46 +01:00
Nan Zhang
e561260e59 Add update-api for Metalava based api-stubs-docs
Use check_api section to put the target files which need to be updated.
But check_api doesn't do actually checking work.

Bug: b/112668343
Test: m -j api-stubs-docs-update-current-api
Change-Id: I0f28e6e480413e0ac5cdff51bc4b2df478a867f6
2018-08-17 13:32:14 -07:00
Nan Zhang
dc72ad5218 Merge "Remove api-stubs-docs targets." 2018-08-17 16:53:11 +00:00
Nan Zhang
1c8219bcdd Use 28.txt as API file for migrating NULLs in Metalava
Use last released API file for annotations reference in master branch
(non-releasing branch).

Test: manual
Bug: b/78245848
Change-Id: I0520231619001032c00d98fdc8cd86aa41f4fa14
2018-08-16 17:10:22 -07:00
Nan Zhang
c28a0ac77c Remove api-stubs-docs targets.
Since api-stubs-docs will be replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I3d2091afb0b5d93250573076d4dc95b47c634f2d
Merged-In: I3d2091afb0b5d93250573076d4dc95b47c634f2d
2018-08-14 13:46:01 -07:00
Nirav Atre
9850dd9751 Implementing support for HIDL native handles in Java
This change implements the equivalent of the C++ native_handle_t type in
Java. Similar to the C++ type, the NativeHandle class wraps an arraylist
of FileDescriptor objects, along with a raw data stream (integer array).

Bug: 35098567
Test: Ran m, hidl_test (C++ and Java). Functionality tests are included
in a separate CL.

Change-Id: Ic53f9a49ae17ce5708577a586230126ab0e222c7
2018-08-13 14:31:17 -07:00
Treehugger Robot
c12090200d Merge "Add libcore/ojluni/annotations as a source for metalava." 2018-08-13 12:22:29 +00:00
Alex Light
159799d7c9 Work around b/70221552
If one sets a sufficiently long OUT_DIR to build into the
//frameworks/base:framework-javastream-protos generate target will
fail due to trying to run a too-long command. This works around that
problem by making the command being run much smaller.

Test: Build
Bug: 70221552
Change-Id: I0134ccfc83469826d3ea8679e1c52b9b52c6d2e0
2018-08-08 09:52:51 -07:00
Pete Gillin
c8cbb36673 Add libcore/ojluni/annotations as a source for metalava.
This adds the new annotations (in Java stub format) to the list that
metalava will merge when building stubs.

Bug: 111639530
Test: `make metalava-api-stubs-docs`
Change-Id: I5e73d1276f0602bd14a41f7a64659b1a7b1347cf
2018-08-07 16:49:08 +01:00
Nan Zhang
7e1e76a6dc Merge changes from topic "offlinesdk-docs"
am: 003f49cf0c

Change-Id: Ie2869c671faab24bfc4f426261e4d079d0f3b5de
2018-08-06 18:54:35 -07:00
Nan Zhang
d9cb1b429a Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs"
am: f8e12c51d4

Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f
2018-08-06 18:30:35 -07:00
Nan Zhang
003f49cf0c Merge changes from topic "offlinesdk-docs"
* changes:
  Add more libs for framework docs generation
  Add offline/online-sdk-docs in Soong.
2018-08-07 00:05:27 +00:00
Nan Zhang
dbc253143b Add more libs for framework docs generation
These two libs are not in the default libs which caused droiddoc report
lots of "package not found warning" when generating offline/online docs.

Test: m -j ds-static-docs
Bug: b/70351683
Change-Id: Ibb1f5e1817895abb1b711dc537493bd93c77077b
2018-08-02 16:29:43 -07:00
Nan Zhang
c3ce78d660 Add offline/online-sdk-docs in Soong.
Since support libraries have been migrated to Soong, these docs modules
currently are ready to be supported in Soong.

Bug: b/70351683
Test: m -j offline-sdk-docs
Change-Id: I8739d94909c7cc830c30fa3d1047d26761cc5076
Merged-In: I8739d94909c7cc830c30fa3d1047d26761cc5076
2018-08-02 12:16:45 -07:00
Nan Zhang
e379f40893 Depend on a module instead of real dir for metalava_merge_annotations_dirs
Bug: b/111916275
Test: touch manual/android/support/design/widget/annotations.xml, and m
-j metalava-api-stubs-docs, and check the built output srcjar.

Change-Id: I82e8b51d66f97ebc3f9f4f5aa75ce33066c95089
2018-08-01 22:19:48 +00:00
Nan Zhang
2a924543f6 Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master 2018-07-31 22:14:41 +00:00
TreeHugger Robot
6928e50c26 Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master 2018-07-30 20:30:35 +00:00
Olivier Gaillard
d9a8e834dd Merge "Enable generating Binder#getTransactionName method."
am: 3134def524

Change-Id: I5dcdceb1d1e4525576ac21a2bba964dfb6bb0006
2018-07-26 07:20:50 -07:00
Olivier Gaillard
b0ea421351 Enable generating Binder#getTransactionName method.
Test: manual
Bug: 111791983
Change-Id: I68090e6fa5a7876b1e878d0b97807856e3053b36
2018-07-26 11:58:42 +01:00
Nan Zhang
e9a76f7317 Add offline/online-sdk-docs in Soong.
Since support libraries have been migrated to Soong, these docs modules
currently are ready to be supported in Soong.

Bug: b/70351683
Test: m -j offline-sdk-docs
Change-Id: I8739d94909c7cc830c30fa3d1047d26761cc5076
Merged-In: I8739d94909c7cc830c30fa3d1047d26761cc5076
2018-07-25 17:42:36 -07:00
Andreas Gampe
37b0763a70 Frameworks: convert platformprotos to soong
(cherry picked from commit af27bf6662)

Bug: 64328974
Test: m
Merged-In: I3729a3132c1ef07dded69801373edf51006fa623
Change-Id: I3729a3132c1ef07dded69801373edf51006fa623
2018-07-25 17:35:35 -07:00
Olivier Gaillard
6722abdede Merge "Disable generating Binder#getTransactionName."
am: 9119e2e49d

Change-Id: Ic2a31bee9e6768c227dd6de8e2500e9e13f77ecf
2018-07-25 13:36:45 -07:00
Pete Gillin
c2b639218e Merge "Turn droiddoc's metalava_merge_annotations_dir into a list."
am: 8c8fb65ad3

Change-Id: I33e614584ec7b445b35872d0b84d5224c6f7c4af
2018-07-25 10:15:02 -07:00
Olivier Gaillard
a657aeb185 Disable generating Binder#getTransactionName.
It might have introduce a performance regression.

Bug: 111791983
Test: manual
Change-Id: I459d9e4e4d2d5d0be0531742a7910848702a1384
2018-07-25 17:18:07 +01:00
Pete Gillin
d6eece37ab Turn droiddoc's metalava_merge_annotations_dir into a list.
This change replaces droiddoc's metalava_merge_annotations_dir
parameter (which takes a single value) with
metalava_merge_annotations_dirs (which takes a list). This will makes
it possible to merge libcore annotations in from a separate directory
under ojluni, instead of adding them in a preprocessing step.

Test: `make metalava-api-stubs-docs` with a local change to add a second directory
Bug: 111639530
Change-Id: I8eb778038c1cb52ddb6fc86d972f555f49e836b2
2018-07-25 11:43:42 +01:00
Olivier Gaillard
c142f686c5 Merge "Enable the generate transaction name for system server."
am: 3e3a6e4760

Change-Id: I0d54112c689aeaf83c4bc108af0a303e2850e85a
2018-07-23 05:07:33 -07:00
Olivier Gaillard
b19219207c Enable the generate transaction name for system server.
Size of vdex,art,oat files (flag off -> on)
- framework/boot*.vdex: +10K  (3.589M -> 3.599M)
- framework/arm64/boot*.{art,oat}: +20K  (4.378M -> 4.398M)

Test: manual
Change-Id: I4938ca5459004494a50ec81db9ef9e0f0e6e7a60
2018-07-23 10:15:54 +00:00
Yifan Hong
58faaa09da IBatteryPropertiesRegistrar: remove unused functions
* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
  functions

Test: builds
Test: boots
Bug: 68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
Merged-In: Ic9a9d337e5cb39784db1a2745297ef985dd31653
(cherry picked from commit dd0e942597)
2018-07-17 15:35:49 -07:00
David Brazdil
c9b5e65747 Merge changes If285d71a,Iffe5be7c
am: f37950d8c3

Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
2018-07-17 03:43:13 -07:00
Colin Cross
d7647c1b66 Mark installable jars with installable: true
Most jars don't need to be installed on the device.  Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.

Bug: 110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
2018-07-10 14:30:07 -07:00
Mathew Inwood
4500790a81 Merge "Add build rule for API->source mapping."
am: b4919259ab

Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
2018-07-10 11:41:48 -07:00
Mathew Inwood
b4919259ab Merge "Add build rule for API->source mapping." 2018-07-10 17:12:37 +00:00