Commit Graph

10423 Commits

Author SHA1 Message Date
Logan Chien
317ce6c762 Fix shared_libs for cc/prebuilt.go am: c7f797ea54
am: 31698575be

Change-Id: I22793d51dafbd2a6be17825a147751d5dfb1d95a
2019-01-22 23:41:55 -08:00
Logan Chien
3e1f847a8a Merge "Add prebuilt ABI checker support to soong" am: f1b3352b97
am: 9839dd76c3

Change-Id: I75b4ab206649c678499d48b62f07538507be1251
2019-01-22 23:34:37 -08:00
Logan Chien
31698575be Fix shared_libs for cc/prebuilt.go
am: c7f797ea54

Change-Id: I2455c46dbce897068ad472740f641e8d5a20c65b
2019-01-22 23:27:35 -08:00
Logan Chien
9839dd76c3 Merge "Add prebuilt ABI checker support to soong"
am: f1b3352b97

Change-Id: I38b6006e3107944826c31bcfb2052b830bff3cd0
2019-01-22 23:26:19 -08:00
Logan Chien
c7f797ea54 Fix shared_libs for cc/prebuilt.go
This commit fixes `shared_libs` for `cc_prebuilt_binary`,
`cc_prebuilt_library_static`, and `cc_prebuilt_library_shared`.  Before
this commit, all shared libraries in `shared_libs` are dropped from the
generated `LOCAL_SHARED_LIBRARIES`.  This commit fixes the problem by
delegating `linkerDeps()` to `libraryDecorator.linkerDeps()`.

This commit also fixes the dependencies to NDK shared libraries.  Before
this change, those dependencies are mapped to a `ndkStubDepTag` and then
ignored by the computation of `AndroidMkSharedLibs`.  This commit adds
it back.

Bug: 123053270
Bug: 119084334
Test: libclang_rt.scudo-*.so can be checked with 2 more hacks.
Change-Id: I59e37e1a3fe0c329e8cb7032e5671f117f7832a0
2019-01-23 07:21:56 +00:00
Logan Chien
f1b3352b97 Merge "Add prebuilt ABI checker support to soong" 2019-01-23 07:21:17 +00:00
Nicolas Geoffray
5b1a6c401a Always do zipalign with uncompressDex. am: 65fd8ba2fe
am: 771b535008

Change-Id: I7ec9c9b671f90c8ce904923c9f3556ca34223cf9
2019-01-22 22:55:11 -08:00
Nicolas Geoffray
771b535008 Always do zipalign with uncompressDex.
am: 65fd8ba2fe

Change-Id: I2f4f906c073d7b645221d8bb06e38b9bc845600b
2019-01-22 22:50:42 -08:00
Nicolas Geoffray
65fd8ba2fe Always do zipalign with uncompressDex.
Also preserve the alignment with hiddenapi.

Test: conscrypt apex has its conscrypt.jar zipaligned.
Change-Id: I43cc0eadb9548c3d8055e12c077fb7bbe1935fe6
2019-01-23 06:36:48 +00:00
Colin Cross
a2d2f2af1a Merge changes from topic "kapt" am: e153382e17
am: cae625c754

Change-Id: I1fd3e4e80c0f28026b2de72e52061d31ba2e2bcf
2019-01-22 19:45:20 -08:00
Colin Cross
cae625c754 Merge changes from topic "kapt"
am: e153382e17

Change-Id: I79be8c0c8ab9c53ea0a93ab25903f28066999038
2019-01-22 19:01:34 -08:00
Colin Cross
e153382e17 Merge changes from topic "kapt"
* changes:
  Pass annotation processors to kotlinc
  Move kotlin to it's own file
2019-01-23 02:18:12 +00:00
Logan Chien
4fcea3d9a3 Add prebuilt ABI checker support to soong
This commit adds prebuilt ABI checker support to soong so that
`cc_prebuilt_library_shared` and `cc_prebuilt_binary` are checked.

To opt out the check, add `check_elf_files: false` to your module.

Bug: 119086738
Test: lunch aosp_sailfish-userdebug && CHECK_ELF_FILES=true make check-elf-files
Change-Id: Idb4290c8f48aad545894a7ae718a537cbf832233
2019-01-23 10:15:02 +08:00
Jaewoong Jung
ac4400c95c Minor code/comment cleanup for app.go. am: de4c02f855
am: 576205dd73

Change-Id: Ic50dbb97631794b29afaa2c0681a434ac98f21ee
2019-01-22 15:23:35 -08:00
Jaewoong Jung
576205dd73 Minor code/comment cleanup for app.go.
am: de4c02f855

Change-Id: I041edcce8390f66079a85d6d3beb054394fee297
2019-01-22 15:15:31 -08:00
Colin Cross
afbb1734f6 Pass annotation processors to kotlinc
Enable the kotlin-annotation-processing plugin and pass annotation
processors to it.

Bug: 122251693
Test: m checkbuild
Test: TestKapt in kotlin_test.go
Change-Id: I841df454beaaa7edd263eea714ca0d958a03c9de
2019-01-22 21:47:19 +00:00
Jaewoong Jung
de4c02f855 Minor code/comment cleanup for app.go.
1. We no longer need AndroidApp.extraLinkFlags.
(https://r.android.com/c/platform/build/soong/+/691332)
(https://r.android.com/c/platform/build/soong/+/792280)
2. Early break in the for loop to find --product flags.
3. Minor var name / comment updates for readability.

Test: app.go / TreeHugger
Change-Id: Iecea3e7cd319267c680422343ded5f7f8e69d0cd
2019-01-22 11:24:50 -08:00
Colin Cross
21fc9bbe19 Move kotlin to it's own file
kapt is going to make kotlin a little more complicated, move the
rules and tests to their own files.

Bug: 122251693
Test: m checkbuild
Change-Id: Ieed78b97995ced210b710bd50c357514cc8e3bc6
2019-01-22 16:32:11 +00:00
Nicolas Geoffray
e520711923 Merge "Don't install java libraries that are already in an apex." am: f8c06c159e
am: 7ef601fcbe

Change-Id: Ie0a339a49bc6e9a7c505b0cc554fcf52e628c701
2019-01-22 00:06:26 -08:00
Nicolas Geoffray
7ef601fcbe Merge "Don't install java libraries that are already in an apex."
am: f8c06c159e

Change-Id: I407a38c0616d7e543f752654ee46310bbd919239
2019-01-21 23:58:31 -08:00
Nicolas Geoffray
f8c06c159e Merge "Don't install java libraries that are already in an apex." 2019-01-22 07:48:05 +00:00
Logan Chien
96014c3f95 Merge "Add sdk version workaround for libclang_rt" am: 5c7c78a2e0
am: 9202e84536

Change-Id: I89e76b9b67d922c45a379e87c79a74e334c7b4ab
2019-01-21 17:23:37 -08:00
Logan Chien
9202e84536 Merge "Add sdk version workaround for libclang_rt"
am: 5c7c78a2e0

Change-Id: I0acd7d6d9268d4291c9249769d13c5ed6548a5b7
2019-01-21 17:18:41 -08:00
Logan Chien
5c7c78a2e0 Merge "Add sdk version workaround for libclang_rt" 2019-01-22 01:04:35 +00:00
Colin Cross
a6067e88b3 Merge "Build java_sdk_library modules when UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true" am: a0e1c1daaa
am: 9517b757cd

Change-Id: I4eba1f649f89f4244bae76293fe160fddc69d3d1
2019-01-21 16:05:30 -08:00
Colin Cross
9517b757cd Merge "Build java_sdk_library modules when UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true"
am: a0e1c1daaa

Change-Id: I7be389c9a4d0ed5ecb34038ca3b9eea94084c9a9
2019-01-21 15:52:07 -08:00
Treehugger Robot
a0e1c1daaa Merge "Build java_sdk_library modules when UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true" 2019-01-21 23:41:06 +00:00
Colin Cross
2c77ceba34 Build java_sdk_library modules when UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true
java_sdk_library modules are usually disabled in favor of prebuilts
when TARGET_BUILD_APPS is set.  Keep them enabled when
UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true, which is used by some unbundled
builds built from a full source tree like mainline modules.

Bug: 123183568
Test: m TARGET_PRODUCT=mainline_modules_arm UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true TARGET_BUILD_APPS=com.android.media
Change-Id: Ifa940769e467ca4b7ad3b95106e184c00680d2ae
2019-01-21 12:18:39 -08:00
Jerome Gaillard
784c73f883 Merge "Add Skia deps to the list of available Windows libraries" am: 13a539c009
am: c5c22a4f86

Change-Id: Ie97f8c6a0a1dbd77dbed2d512d1267cf783435da
2019-01-21 12:17:36 -08:00
Jerome Gaillard
c5c22a4f86 Merge "Add Skia deps to the list of available Windows libraries"
am: 13a539c009

Change-Id: I45c4f8d8305b9ef8f296d50b374d778fabdaf362
2019-01-21 12:13:31 -08:00
Jerome Gaillard
13a539c009 Merge "Add Skia deps to the list of available Windows libraries" 2019-01-21 20:08:01 +00:00
David Brazdil
c401da838d Replace hiddenapi-{public,private}-list.txt with a CSV file am: 0f670a22df
am: d65f5e61fc

Change-Id: Ie6ba99f9f3c8a556c21de2e2f9a5609677d1d36e
2019-01-21 11:46:15 -08:00
David Brazdil
d65f5e61fc Replace hiddenapi-{public,private}-list.txt with a CSV file
am: 0f670a22df

Change-Id: I815c2885cee28af0709baa8fcb83e6adc7020a1c
2019-01-21 10:52:52 -08:00
David Brazdil
0f670a22df Replace hiddenapi-{public,private}-list.txt with a CSV file
`hiddenapi` is being refactored to work with a single CSV file as
opposued to a multitude of text files (one per flag). This patch
changes the singleton rule for listing public/private APIs from
stubs to expect a CSV as an output.

Bug: 119068555
Test: compiles, hiddenapi-flags.csv unchanged
Change-Id: I622521d59979a6b01ecc8065a278412fedf7b9bc
2019-01-21 14:30:49 +00:00
Nicolas Geoffray
4bdea39ad2 Don't install java libraries that are already in an apex.
This need to have -hostdex rules not look at the installFile.
In the near future, all -hostdex files come from jars that are in an apex.

bug: 119868597
Test: m
Change-Id: I4423626c5ced5d098ddd97c122fbfced54f817fc
2019-01-21 14:02:17 +00:00
Jerome Gaillard
7f7f34f81a Add Skia deps to the list of available Windows libraries
Building Skia for Windows requires linking some Windows libraries that
were not in the list of available ones. This adds the necessary
libraries.

Test: N/A
Change-Id: I803b7b05f47163316c6f03866145dc50656a6bef
2019-01-21 11:34:46 +00:00
Jiyong Park
2c271d85ef Merge "Fix: APEX gets .jar.jar suffix when TARGET_FLATTEN_APEX is true" am: 1eb88bb494
am: c587828ef9

Change-Id: Ie29ae0448a0f97d0f7ef3a593b8440d7176d114e
2019-01-21 02:53:22 -08:00
Tor Norbye
e2ead404ed Update signature files to the new format am: 76c875a796
am: e921931dbf

Change-Id: I9609ae45983f93fa0d0fc84259496e1eb4c3bf39
2019-01-21 02:40:43 -08:00
Logan Chien
834b9a6216 Add sdk version workaround for libclang_rt
libclang_rt.*.so depends on libc++, which is not a part of NDK.  Thus,
this workaround must be added in order not to break the build when the
prebuilt dependencies are checked.

Bug: 121358700
Test: make checkbuild
Change-Id: Icaeb7adf96fb72829053e198b659ebcb19a035fc
2019-01-21 10:29:47 +08:00
Jiyong Park
c587828ef9 Merge "Fix: APEX gets .jar.jar suffix when TARGET_FLATTEN_APEX is true"
am: 1eb88bb494

Change-Id: I33a1a0ab4b9d04cce3f106c830a3a9d32b3c2b21
2019-01-20 07:57:32 -08:00
Treehugger Robot
1eb88bb494 Merge "Fix: APEX gets .jar.jar suffix when TARGET_FLATTEN_APEX is true" 2019-01-20 15:47:49 +00:00
Tor Norbye
e921931dbf Update signature files to the new format
am: 76c875a796

Change-Id: I95d30337576f49db965473dd5cf800992d0082c0
2019-01-20 07:21:30 -08:00
Jiyong Park
087b541afd Fix: APEX gets .jar.jar suffix when TARGET_FLATTEN_APEX is true
soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar. Therefore, we
need to remove .jar suffix from LOCAL_MODULE_STEM, otherwise, we
will have .jar.jar suffix.

Bug: 123092860
Test: TARGET_FLATTEN_APEX=true apex.test
Check /system/apex/apex.test/javalib/core-oj.jar is there.

Change-Id: Ie19b20523753ec32ab16266f63d26c4df685cc34
2019-01-20 22:42:33 +09:00
Tor Norbye
76c875a796 Update signature files to the new format
The new format is described in tools/metalava/FORMAT.md.

Fixes: 116589402 Switch signature files over to the v2 format
Fixes: 112626813 Drop "synchronized" modifier from the signature format
Fixes: 122358225 Omit overriding methods that only differ in final [...]
Fixes: 73088715 API Review: Need doclava to output nullability
Fixes: 79739773 API Review: Metalava enforcing constants are constant
Exempt-From-Owner-Approval: Large-scale tooling change
Test: make sdk, make update-api, make checkapi
Merged-In: I8314f4e7099fa92e4f8ed7d283ccf836cc9a84a0
Change-Id: I828ec5ea2f879ebf8dd4ead651e9c9d2345f52e0
2019-01-19 21:36:07 -08:00
Elliott Hughes
e057350776 Revert "Switch to toybox hostname(1)." am: d2c476cd2d
am: 6c17289a4d

Change-Id: Ieadac58a5b01477f4e91fb151b9f293e5e3c7458
2019-01-19 14:19:59 -08:00
Elliott Hughes
6c17289a4d Revert "Switch to toybox hostname(1)."
am: d2c476cd2d

Change-Id: I80606e1695bbbeb1f1a6c3156a0b46f7ea961e6c
2019-01-19 14:15:00 -08:00
Elliott Hughes
d2c476cd2d Revert "Switch to toybox hostname(1)."
This reverts commit b115b81095.

Reason for revert: http://b/123123255

Change-Id: I0f2bfebf1189fdc71e093538a8b228dd0e0b6946
2019-01-19 18:55:54 +00:00
Elliott Hughes
53c4643773 Switch to toybox which(1). am: 44f0d4e1fc
am: 8b79bdc260

Change-Id: Idb2a5df899983b09355324f18a855d8eef8ad70c
2019-01-19 10:31:54 -08:00
Elliott Hughes
8b79bdc260 Switch to toybox which(1).
am: 44f0d4e1fc

Change-Id: Ie8a34cec33aee474473142bf0000fe4df53dfa27
2019-01-19 10:24:53 -08:00
Elliott Hughes
2d2a92f456 Switch to toybox pgrep(1), pkill(1), and ps(1). am: db96fc8744
am: 78aeade01d

Change-Id: Ifd4fa0739e034dcf5c71ba25d13006cd8949f4fe
2019-01-19 09:56:47 -08:00