Commit Graph

24594 Commits

Author SHA1 Message Date
Ulyana Trafimovich
2ff8b5df62 Merge "Propagate transitive SDK Java library dependencies to dexpreopt." am: b8822a0616 am: eb285d43fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1408708

Change-Id: Iecbedae2d07363f625a0fecba1f4a7adedcdd860
2020-08-28 10:35:50 +00:00
Ulyana Trafimovich
eb285d43fe Merge "Propagate transitive SDK Java library dependencies to dexpreopt." am: b8822a0616
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1408708

Change-Id: Ia5c85d4370deff72b1dbc83064440ea9f1a1440d
2020-08-28 09:55:25 +00:00
Ulyana Trafimovich
b8822a0616 Merge "Propagate transitive SDK Java library dependencies to dexpreopt." 2020-08-28 09:36:13 +00:00
Thiébaud Weksteen
8bd1e224b0 Merge "cc: export Stripper struct" am: 03156929db am: 44c0a17793
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404788

Change-Id: I0998951ffcde60254f69f99cf55cd564472990e9
2020-08-28 09:03:46 +00:00
Bowgo Tsai
dffdcb2d6a Merge "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" am: 38414db4de am: aeca1f6aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413430

Change-Id: I7b3b4dee24f62f30578ff970fcdd193e87aa1c21
2020-08-28 09:03:40 +00:00
Thiébaud Weksteen
6ad781dadb Return all rules when TestingModule.Rule fails am: 3600b80e6f am: d8dfb130b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413494

Change-Id: If8a415fc7fddb5f9e7e9149a4c92890ffee3d0b4
2020-08-28 09:03:15 +00:00
Thiébaud Weksteen
44c0a17793 Merge "cc: export Stripper struct" am: 03156929db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404788

Change-Id: I836ecc56d2657d3c52827b11d2e332dcb8b854a9
2020-08-28 08:33:41 +00:00
Bowgo Tsai
aeca1f6aa0 Merge "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" am: 38414db4de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413430

Change-Id: I27e6f7450ad00ae056695f2d48f0ea16c1a3f2e8
2020-08-28 08:33:36 +00:00
Thiébaud Weksteen
d8dfb130b1 Return all rules when TestingModule.Rule fails am: 3600b80e6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413494

Change-Id: Iec90c67bc31abb309c604177ab65b02cb04c5b6f
2020-08-28 08:33:29 +00:00
Thiébaud Weksteen
03156929db Merge "cc: export Stripper struct" 2020-08-28 08:32:28 +00:00
Bowgo Tsai
38414db4de Merge "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" 2020-08-28 08:15:48 +00:00
Thiébaud Weksteen
3600b80e6f Return all rules when TestingModule.Rule fails
Similarly to Output, we return the list of Rules that have been
generated for TestingModule. This helps debugging failing tests.

Test: m nothing
Change-Id: I3542f4e4632f94fb84208c2e48e629271a373fd4
2020-08-28 08:15:09 +00:00
Bowgo Tsai
988ff8d149 Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"
This reverts commit 5010a97388.

Reason for revert:  b/166728338 - build failures on master branch

Bug: 162702246
Bug: 166728338
Change-Id: Ie9e51e7c5533d220ad3e160439cb38ff88f068ac
Test: TreeHugger
2020-08-28 08:08:36 +00:00
Treehugger Robot
1e88888c83 Merge "[pgo] Return updated Flags after adding flags for PGO/AFDO" am: 1fde95ac3f am: b2403bc2f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414408

Change-Id: I5b7dde3a337c174f6b48181ed4f5309e41ad280c
2020-08-28 04:59:33 +00:00
Treehugger Robot
8edb789774 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 10a3873a80 am: 21f698a5c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393237

Change-Id: I54c57cad9d581fea5fba5ce30f1465f54b9e276c
2020-08-28 04:59:26 +00:00
Treehugger Robot
b2403bc2f7 Merge "[pgo] Return updated Flags after adding flags for PGO/AFDO" am: 1fde95ac3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414408

Change-Id: I93c3408fac01018c2fc8835614d73ab68b2a7b66
2020-08-28 04:52:43 +00:00
Treehugger Robot
1fde95ac3f Merge "[pgo] Return updated Flags after adding flags for PGO/AFDO" 2020-08-28 04:50:08 +00:00
Treehugger Robot
21f698a5c6 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 10a3873a80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393237

Change-Id: I7f43582f31953d75fc3f4f7f7c01d140015d795e
2020-08-28 04:42:47 +00:00
Treehugger Robot
10a3873a80 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" 2020-08-28 04:26:49 +00:00
Pirama Arumuga Nainar
5010a97388 [pgo] Return updated Flags after adding flags for PGO/AFDO
Bug: http://b/162702246

Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
      PGO instrumentation.
Change-Id: I8044702e0aed4fa7bb9ac71608a83a95f319abd9
2020-08-27 16:28:45 -07:00
Ivan Lozano
3cdb13d49b Merge "[rust] Pass cc dependencies as linker flags." am: b0e99edab1 am: 61b6656332
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1410907

Change-Id: I1fd8b80bed2b922e58e3c6a4f73d8c2956c7f41e
2020-08-27 22:19:49 +00:00
Ivan Lozano
61b6656332 Merge "[rust] Pass cc dependencies as linker flags." am: b0e99edab1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1410907

Change-Id: If88108a6ae5959ea57833f163f8d0c460a343d23
2020-08-27 21:53:11 +00:00
Ivan Lozano
b0e99edab1 Merge "[rust] Pass cc dependencies as linker flags." 2020-08-27 20:50:16 +00:00
Jeongik Cha
219141c6bb Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES
If BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES has a numeric value,
it replaces "current" or "system_current" with the version which
the flag indicates.

Bug: 163009188
Test: BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES=29 m, and then check if every vendor
java module's sdk_version is 29 if its sdk_version was current.

Change-Id: I17b49b8e02caf2d1bc57b91648d4420f3ad9fcb9
2020-08-27 23:09:54 +09:00
Ulya Trafimovich
fc24ad3d4e Propagate transitive SDK Java library dependencies to dexpreopt.
For some dependencies, like stubs, the SDK library may not be found at
build time (either because the implementation library is not among the
dependencies of the dexpreopted module, or because it's part of a
prebuilt, or because it's missing from the build altogether). In such
cases dexpreopt is useless, because dex2oat does not have access to the
full classpath (unless the &-classpath is used). Therefore do not
dexpreopt in such cases.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: If289088cfd103011ccb16165e95a97b30fd31b81
2020-08-27 11:47:15 +01:00
Ulyana Trafimovich
5283f5fe37 Merge "Export error reporting function to allow using it in other packages." am: 03333d0e2f am: ffcc1d5418
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409809

Change-Id: Iecaff57b21d7f5a25d2cbfcd293f4fa222484f89
2020-08-27 10:21:17 +00:00
Ulyana Trafimovich
ffcc1d5418 Merge "Export error reporting function to allow using it in other packages." am: 03333d0e2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409809

Change-Id: I19ebf395226992bbeaf6be36a482f6e52fb21f26
2020-08-27 09:46:07 +00:00
Ulyana Trafimovich
03333d0e2f Merge "Export error reporting function to allow using it in other packages." 2020-08-27 09:07:51 +00:00
Thiébaud Weksteen
d458745f15 cc: export Stripper struct
The cc stripping logic can be reused for Rust. Export the Stripper
structure for that purpose. Extract the strip-related flags from
builderFlags into StripFlags. Add the method flagsToStripFlags
(similarly to flagsToBuilderFlags).

Add the helper method disableStripping on libraryDecorator.

Test: m
Bug: 153430439
Change-Id: I11aef1abb8d498a4c1672500a7398279edf7f548
2020-08-27 10:13:42 +02:00
Colin Cross
ef70e3f8bc Merge changes I6aa28149,I1ff35ea9 am: 3806fc0943 am: fb6ddeb5fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406258

Change-Id: I5d1ca5d5927b3a3c8641a17d2bc40cf10352c1e9
2020-08-27 01:28:50 +00:00
Colin Cross
fb6ddeb5fd Merge changes I6aa28149,I1ff35ea9 am: 3806fc0943
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406258

Change-Id: Ie4d910fb6851d8da7ea1b21fb02c08e512ba3e78
2020-08-27 00:59:23 +00:00
Colin Cross
3806fc0943 Merge changes I6aa28149,I1ff35ea9
* changes:
  Remove TestApexWithJniLibs_Errors
  Create image variations for sh_binary
2020-08-27 00:29:36 +00:00
Treehugger Robot
e0b4c0f851 Merge "apex: pass "apex name" as literal to apex variants" am: d1ac3a79e0 am: 613222477c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1403227

Change-Id: Id91c20feae2f5718714db09c24b1b64018811ce3
2020-08-27 00:18:14 +00:00
Treehugger Robot
613222477c Merge "apex: pass "apex name" as literal to apex variants" am: d1ac3a79e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1403227

Change-Id: I44b34edae5122fa674ec81e81ef1809e48109edf
2020-08-27 00:10:52 +00:00
Treehugger Robot
7ac243e9ea Merge "bootstrap is added for cc_binary only when the module is in an APEX" am: 23a6a41c66 am: bf49e6e7fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409927

Change-Id: I3768014726edd74f24d98b28c3bfc8c85b19bff8
2020-08-27 00:10:50 +00:00
Treehugger Robot
d1ac3a79e0 Merge "apex: pass "apex name" as literal to apex variants" 2020-08-27 00:01:15 +00:00
Treehugger Robot
bf49e6e7fc Merge "bootstrap is added for cc_binary only when the module is in an APEX" am: 23a6a41c66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409927

Change-Id: Iac3325aafb10daddbd8cc33a60b5815ab857ee94
2020-08-26 23:53:38 +00:00
Treehugger Robot
23a6a41c66 Merge "bootstrap is added for cc_binary only when the module is in an APEX" 2020-08-26 23:28:54 +00:00
Ivan Lozano
b063cce1bd Merge "Link device binaries dynamically by default." am: 4d947f0ea8 am: 8ee04afe36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1403871

Change-Id: I2fb54f7a0329c3e098785d0ba7f1f28ee3d8054a
2020-08-26 21:15:10 +00:00
Ivan Lozano
2093af23c0 [rust] Pass cc dependencies as linker flags.
In order to support cc dependencies which do not start with the 'lib'
prefix, we can't pass them through the -l flag. Instead, we can pass
them directly to linker flags.

Bug: 166151658
Test: cd external/rust/; mma
Test: cd external/crosvm/; mma
Test: Test linking to a cc dep that does not begin with 'lib'

Change-Id: I5acbf3d3405e66446f3eae600b35683c4eb3d8a5
2020-08-26 17:07:29 -04:00
Ivan Lozano
8ee04afe36 Merge "Link device binaries dynamically by default." am: 4d947f0ea8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1403871

Change-Id: Ic617ce674f03c9cacaba90519694b437f66e1626
2020-08-26 20:49:03 +00:00
Ivan Lozano
4d947f0ea8 Merge "Link device binaries dynamically by default." 2020-08-26 20:32:32 +00:00
Joel Galenson
6e55b7a046 Migrate away from removed option am: 6945e9b650 am: 4915521f1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1411147

Change-Id: If2565df719057d297f83aba8f6610b2a041409d8
2020-08-26 02:31:07 +00:00
Joel Galenson
4915521f1d Migrate away from removed option am: 6945e9b650
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1411147

Change-Id: I74770ad7a04a4a01e4f2521385f7d5fb8dc0e75d
2020-08-26 02:09:05 +00:00
Treehugger Robot
4f2e10a299 Merge "Bazel overlay: rename 'deps' to 'module_deps'." am: 2d078b814a am: 1067b6c21c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409587

Change-Id: I1a19a867e764d23c87f822579788e83dcaf3eb58
2020-08-25 22:48:50 +00:00
Treehugger Robot
1067b6c21c Merge "Bazel overlay: rename 'deps' to 'module_deps'." am: 2d078b814a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409587

Change-Id: Ibcc139bc5f0e9d5cb1314d977acae23899348349
2020-08-25 22:31:16 +00:00
Joel Galenson
6945e9b650 Migrate away from removed option
Upstream removed the -Z no-landing-pads option in
https://github.com/rust-lang/rust/pull/70175, which we picked up in
our latest toolchain update.

Fixes: 166317885
Test: Build and TreeHugger
Change-Id: I51c0ef671bf6a334b2b7223da42cab547e4407d3
2020-08-25 15:27:15 -07:00
Treehugger Robot
2d078b814a Merge "Bazel overlay: rename 'deps' to 'module_deps'." 2020-08-25 21:40:50 +00:00
Ivan Lozano
042504f7d6 Link device binaries dynamically by default.
Device binaries currently are linked statically by default. Instead we
should be linking these dynamic by default. To avoid conflicts when
manually specifying rlib dependencies on modules, we always link libstd
dynamically for all device modules except static libraries.

This removes the "prefer_dynamic" property entirely to avoid confusion.

Bug: 165161105
Test: m profcollectd is built dynamically.
Test: cd external/rust/; mma
Test: cd external/crosvm/; mma
Change-Id: I25ac897040acbcc2d97c791a33e8e01610632272
2020-08-25 13:32:53 -04:00
Ulya Trafimovich
5ab276ad1d Export error reporting function to allow using it in other packages.
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I3a1d936ac57966b2f47cb1d9a56e0f96f47b807d
2020-08-25 12:45:15 +01:00