Commit graph

8287 commits

Author SHA1 Message Date
Sundong Ahn
dd567f9c14 Add new properties
Droiddoc_options is added, since all sdk libraries don't builds with the
same argument. We provide basic droiddoc argument and options can be
added like "stubsourceonly" by this property.

When building stubs, soong don't make dex files, but some module uses
dex files from stubs. So Complie_dex is added for compiling dex
regardless of installable.

Srcs_lib_whitelist_pkgs property is added for using other whitelist
pkgs instead of "android.annotation".

Bug: 77577799
Test: m -j
Change-Id: Ic2fb7bc9c49a825550dbebe3e9132ad9a735322f
2018-08-01 02:18:32 +00:00
Dario Freni
62c4275a98 Merge "Add product-services to installclean" am: be1b6f445e
am: 18f04a0487

Change-Id: I8e26235d936453fe69b5676cf0cd296fd1239ea6
2018-07-31 12:42:48 -07:00
Dario Freni
18f04a0487 Merge "Add product-services to installclean"
am: be1b6f445e

Change-Id: I9ac250da6f1001ea5caa1163aaa1eff4caeacba7
2018-07-31 12:33:45 -07:00
Treehugger Robot
be1b6f445e Merge "Add product-services to installclean" 2018-07-31 19:25:20 +00:00
Logan Chien
42cf4b8715 Merge "Remove LinuxClangCppflags" am: 7a1d4418d6
am: dc9321b257

Change-Id: I0988dcf773d249db6b636c936bc4b6b05e79f686
2018-07-31 11:00:34 -07:00
Logan Chien
dc9321b257 Merge "Remove LinuxClangCppflags"
am: 7a1d4418d6

Change-Id: I5507797e2ff5e7c08b9dfd1d04d15d29c290ac69
2018-07-31 10:56:27 -07:00
Logan Chien
7a1d4418d6 Merge "Remove LinuxClangCppflags" 2018-07-31 17:51:17 +00:00
Dario Freni
77d51c6e06 Add product-services to installclean
Test: m installclean
Bug: 80741439
Change-Id: I55f1e4fbe66430625fe32b724bbf21034c956eff
2018-07-31 18:29:49 +01:00
Nan Zhang
85f12ea736 Merge "bundle files related to sdk dev tool with generated docs." am: a5949691b5
am: 2158d6ff95

Change-Id: I4ac4703cb0b3b5ff7708d9226e76977345ddd87c
2018-07-30 13:54:31 -07:00
Nan Zhang
2158d6ff95 Merge "bundle files related to sdk dev tool with generated docs."
am: a5949691b5

Change-Id: I0795b5a3da0e516f42b7020df789665224e61686
2018-07-30 13:41:24 -07:00
Nan Zhang
a5949691b5 Merge "bundle files related to sdk dev tool with generated docs." 2018-07-30 20:31:59 +00:00
Logan Chien
bef00a2c52 Remove LinuxClangCppflags
This commit removes LinuxClangCppflags.  Adding these `-isystem` flags
results in build failures when we build a module with `libc++_host`.
Furthermore, these headers are not being used anymore.

Bug: 111579848
Test: make checkbuild  # on aosp and internal
Change-Id: Ideca268431d9d60d383e3e5b7bb3f73ece416bd2
2018-07-31 01:45:00 +08:00
Chih-Hung Hsieh
bafbeac702 Do not pass -flto dependent flags to clang-tidy. am: ff7cff7268
am: 9e7e09b77a

Change-Id: Ia26281d74e74cb4aa6f111e2273a012e9a266350
2018-07-26 20:23:10 -07:00
Chih-Hung Hsieh
9e7e09b77a Do not pass -flto dependent flags to clang-tidy.
am: ff7cff7268

Change-Id: I0da058960c67b69ecf2df63e5f2b385b82eea80e
2018-07-26 20:19:07 -07:00
Chih-Hung Hsieh
ff7cff7268 Do not pass -flto dependent flags to clang-tidy.
Bug: 111885396
Test: run with WITH_TIDY=1
Change-Id: I92468491cdc5894d1197f6c1631e2073c6e7c4fa
2018-07-26 17:43:12 -07:00
Chih-Hung Hsieh
d31b3f87dd Merge "Do not pass -flto and -fsanitize flags to clang-tidy." am: 9f65ef8cd9
am: 167d8c77ba

Change-Id: Ibe7416e9ae2b5b1f73dda5862a3c3eebda33bc60
2018-07-26 17:04:54 -07:00
Chih-Hung Hsieh
167d8c77ba Merge "Do not pass -flto and -fsanitize flags to clang-tidy."
am: 9f65ef8cd9

Change-Id: I7edbaaa8cccabe2b2952fa88499bdfbecfecf60a
2018-07-26 16:59:42 -07:00
Treehugger Robot
9f65ef8cd9 Merge "Do not pass -flto and -fsanitize flags to clang-tidy." 2018-07-26 23:52:01 +00:00
Nan Zhang
90fe6746a7 bundle files related to sdk dev tool with generated docs.
bundle files related to sdk dev tool(activity_actions.txt, and etc.) to the
final -docs.zip file since sdk.atree needs to copy these files from
$(OUT_DOCS)/offline-sdk dir.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: I3bfb3c56570dd6728dec272d38c6046e0d44c40f
Merged-In: I3bfb3c56570dd6728dec272d38c6046e0d44c40f
2018-07-26 16:13:23 -07:00
Colin Cross
39929c79d7 Merge "Set targetSdkVersion in manifest_fixer" am: 4ac2db24eb
am: a0f23a4329

Change-Id: I1616ea1d56829de7c28a8fcfa2cb155fb01107db
2018-07-26 15:24:09 -07:00
Steven Moreland
6e447aec15 Build Java aidl w/ '-b'. am: 667f688f36
am: 570251f9b1

Change-Id: Idf412b408cd9581502b4219715cf84e92fd498a0
2018-07-26 15:22:47 -07:00
Colin Cross
a0f23a4329 Merge "Set targetSdkVersion in manifest_fixer"
am: 4ac2db24eb

Change-Id: Ic9827f6c357919347ad0300fe91040171e9526b4
2018-07-26 15:11:29 -07:00
Steven Moreland
570251f9b1 Build Java aidl w/ '-b'.
am: 667f688f36

Change-Id: I90cbcc29ca395e799e5f64d9135a002f025b5efa
2018-07-26 15:11:05 -07:00
Colin Cross
4ac2db24eb Merge "Set targetSdkVersion in manifest_fixer" 2018-07-26 22:02:36 +00:00
Chih-Hung Hsieh
5942fe4fd1 Do not pass -flto and -fsanitize flags to clang-tidy.
Some flags stop clang-tidy to search included header files.

Bug: 111885396
Test: run with WITH_TIDY=1
Change-Id: Ie1ac37298793c015286db0f5caa252b67f4db365
2018-07-26 15:00:28 -07:00
Steven Moreland
667f688f36 Build Java aidl w/ '-b'.
As it turns out, AIDL originally passed and returned success
when it was asked to compile an unstructured parcelable even
though no output files were created.

The build system currently can't handle this because it is
expecting outputs here, so I am adding this argument here
which will cause the compiler to exit and error earlier as
expected.

Notice also that the make implementation of the AIDL build
system also passes in this argument.

Test: m framework (which invokes this many times)
Bug: N/A
Change-Id: Ia9b5280dc3593756784035a523399545c9947d80
2018-07-26 12:55:08 -07:00
Colin Cross
1b6a3cfea4 Set targetSdkVersion in manifest_fixer
If targetSdkVersion is not set in the manifest, set it to the
value it was implicitly using before changing minSdkVersion.
Requires passing --library to manifest_fixer.py to distinguish
between apps, where the implicit value was set by aapt2 to
current, or libraries where the implicit value was 1.
Fixes cases where the manifest does not specify targetSdkVersion
and was inheriting the minSdkVersion value until manifest merger
started merging a lower targetSdkVersion value from a library.

Bug: 111347801
Test: manifest_fixer_test.py
Change-Id: I8fcf0c5f452707565ba1808f6fe552ffed055c47
2018-07-26 11:09:24 -07:00
Sundong Ahn
34878d30ba API txt files are dist artifacts am: 20e998b32c
am: 7d8295cc12

Change-Id: I488add2de6c73985f34f55b30e8250da2e7874ae
2018-07-25 21:49:26 -07:00
Sundong Ahn
7d8295cc12 API txt files are dist artifacts
am: 20e998b32c

Change-Id: I0d77bb3e0331c609f168e1eb1c58eb8a7fb3b468
2018-07-25 21:45:27 -07:00
Sundong Ahn
20e998b32c API txt files are dist artifacts
API txt files from a java_sdk_library are automatically registered as
dist artifacts for sdk and win_sdk targets.

They are installed under $(DIST_DIR)/apistubs/<apiscope>/api/<name>.txt
where <apiscope> can be public, system and test.

Bug: 77577799
Test: m -j
Change-Id: I38cd8ee000445ce843ac01ead38001e509228738
2018-07-26 01:40:08 +00:00
Pete Gillin
5014b01601 Turn droiddoc's metalava_merge_annotations_dir into a list. am: b13a015cee
am: 690dfda955

Change-Id: Id726a1731eb4f6874b27f857777503e1122856a8
2018-07-25 10:20:20 -07:00
Pete Gillin
690dfda955 Turn droiddoc's metalava_merge_annotations_dir into a list.
am: b13a015cee

Change-Id: I5551aeb25ff33719551d04fcd326e0bf47169ad6
2018-07-25 10:08:14 -07:00
Pete Gillin
b13a015cee 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.

It is implemented by passing the --merge-annotations argument to
metalava multiple times, which is already supported by metalava's
command line parsing.

Test: `make metalava-api-stubs-docs` with a local change to add a second directory in //frameworks/base/Android.bp
Bug: 111639530
Change-Id: I53d31f1dd45c13405b4511c2b44cbeb7f0e439d1
2018-07-25 11:37:44 +01:00
Dan Willemsen
93206bc8b8 Mark soong-generated phony rules as PHONY am: a03c43a4a7
am: b1b05b9978

Change-Id: I7eb32398333854d566831b7a833df6ab9c8dd152
2018-07-25 00:43:57 -07:00
Dan Willemsen
b1b05b9978 Mark soong-generated phony rules as PHONY
am: a03c43a4a7

Change-Id: I3dec0c4664a03197572f2845f875cefc63d2f1dc
2018-07-25 00:39:54 -07:00
Dan Willemsen
a03c43a4a7 Mark soong-generated phony rules as PHONY
Test: add --writable=out/ to kati, see fewer warnings with this change
Change-Id: I4beb47f41888e3743b298c90edfeb38fcc0b3d32
2018-07-25 04:27:10 +00:00
Nan Zhang
e6e160cee5 Merge changes from topic "metalava-sdk-jar" am: cce87cbaa0
am: a9ebb36a15

Change-Id: I0952bbce2f37f4dd9f4e8a4b05d7de27d2891927
2018-07-24 17:15:28 -07:00
Nan Zhang
4122218325 Use Metalava based android.jar for SDK am: 03b733c936
am: 6c14e73786

Change-Id: I4837bd790119f83917735d6be9f76587c5cbedc9
2018-07-24 17:15:18 -07:00
Ryan Prichard
07c5952b1d Revert part of "Stop versioning NDK stubs pre-M." am: 37ebbdee6c
am: 81947d241c

Change-Id: I49be6f68894928f09557305d8ddedf5616b9c1e7
2018-07-24 17:14:57 -07:00
Nan Zhang
a9ebb36a15 Merge changes from topic "metalava-sdk-jar"
am: cce87cbaa0

Change-Id: I5edc638cc8c859336c9de5e7e4b8dd9f0ff3004d
2018-07-24 17:06:20 -07:00
Nan Zhang
6c14e73786 Use Metalava based android.jar for SDK
am: 03b733c936

Change-Id: Id20a26219c3549a0de1ec6112e89788e2e6e357d
2018-07-24 17:06:09 -07:00
Ryan Prichard
81947d241c Revert part of "Stop versioning NDK stubs pre-M."
am: 37ebbdee6c

Change-Id: Icd202a99e39622e9d788763bf819a0d7be5acfad
2018-07-24 17:05:41 -07:00
Dan Albert
695b3b3c9e [automerger skipped] Stop versioning NDK stubs pre-M.
am: 6bc5b8320f  -s ours

Change-Id: I833e52654c89a1e4d1159b3b6ddd72e20725f880
2018-07-24 16:59:21 -07:00
Dan Albert
6bc5b8320f Stop versioning NDK stubs pre-M.
Test: make ndk # readelf various stubs to check version info
Bug: https://github.com/android-ndk/ndk/issues/622
Change-Id: Ic2930cfe5ee8377bb89bfb1bc051b6975f6e57d3
Merged-In: Ic2930cfe5ee8377bb89bfb1bc051b6975f6e57d3
(cherry picked from commit c229f38e93)
2018-07-24 22:52:57 +00:00
Nan Zhang
cce87cbaa0 Merge changes from topic "metalava-sdk-jar"
* changes:
  Add private-stub-annotations.jar as core-java lib
  Use Metalava based android.jar for SDK
2018-07-24 22:44:12 +00:00
Ryan Prichard
37ebbdee6c Revert part of "Stop versioning NDK stubs pre-M."
This reverts commit e67144e302.

Keep the getApiLevelsMap function and keep using it in
shouldUseVersionScript. It seems useful. (Also, keeping it probably avoids
an AOSP->internal merge conflict...)

Bug: https://github.com/android-ndk/ndk/issues/750
Test: m out/soong/ndk.timestamp, examine dynsym in stubs
Change-Id: Icbb26fc46a9a1dc99f22af195468f08713c4f216
2018-07-24 12:46:35 -07:00
Dan Willemsen
4da691d64c Merge "Turn on phony checks" am: e029b28d97
am: 2358e0400f

Change-Id: I94863854eca2d1cc91f4c4bbc53a4af7b029bad4
2018-07-24 11:21:44 -07:00
Dan Willemsen
2358e0400f Merge "Turn on phony checks"
am: e029b28d97

Change-Id: I68a777c9dd81142fda8ef107175e30369ac809e2
2018-07-24 11:17:11 -07:00
Nan Zhang
03b733c936 Use Metalava based android.jar for SDK
Define LOCAL_DROIDDOC_ANNOTATIONS_ZIP to export zip file.

Test: m out/target/common/obj/PACKAGING/metalava-api-stubs-docs_annotations.zip
Bug: b/78245848
Change-Id: I66ca2a50adc095cc8a8a1a10620427a91480a9bc
2018-07-24 11:16:56 -07:00
Nan Zhang
ec93cd9f2a Add private-stub-annotations.jar as core-java lib
Since currently android.jar compile against to it.

Test: m -j metalava_android_stubs_current
Bug: b/78245848
Change-Id: Id5812f69125085821182295e577849b5f2c4bead
2018-07-24 11:16:56 -07:00