Commit Graph

32944 Commits

Author SHA1 Message Date
Colin Cross
cc288ca3f4 Merge changes from topic "sbox_tools" am: 97a1be6e7b am: 62bc8d2316
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1531944

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1788ff6407a03242902d572eb747abfa538d9578
2020-12-17 23:16:31 +00:00
Colin Cross
62bc8d2316 Merge changes from topic "sbox_tools" am: 97a1be6e7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1531944

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86b631d1263bca0a05f807a1951a7260392fbfd5
2020-12-17 22:39:33 +00:00
Colin Cross
97a1be6e7b Merge changes from topic "sbox_tools"
* changes:
  Sandbox genrule tools
  Call ctx.InstallFile for uninstallable cc modules
  Don't copy uninstallable variants of NDK libraries to sysroot
2020-12-17 22:01:06 +00:00
Treehugger Robot
daae635e18 Merge "Add test & documentation for PropertiesToApply" am: 41351b5334 am: 16967c330f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1532258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0448d7d13c1a106120e8eaa84f27891846c60438
2020-12-17 20:40:05 +00:00
Treehugger Robot
16967c330f Merge "Add test & documentation for PropertiesToApply" am: 41351b5334
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1532258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b9fc54dafa25d7fb260108d619de04389adbb18
2020-12-17 20:20:16 +00:00
Treehugger Robot
41351b5334 Merge "Add test & documentation for PropertiesToApply" 2020-12-17 19:55:25 +00:00
Liz Kammer
fe8853d2e6 Add test & documentation for PropertiesToApply
Document PropertiesToApply expectations about props, and suggest it
should generally be generated via CreateProperties.

Test: go soong tests
Test: m nothing
Change-Id: I7cc2590db96865382ad6e0da333d4a4e2c697f45
2020-12-17 18:59:41 +00:00
Colin Cross
ba9e403703 Sandbox genrule tools
This relands I38393900677c5dbe8e72fe06a7dd7d71f3c09f82 after
I8038ed5c6f05c989ac21ec06c4552fb3136b9a7a, which makes the ASAN
variants of libraries have PackagingSpecs so they can be copied
into sandboxed genrules.

Copy tools used by genrules into the sandbox directory.  This
ensures correct dependencies on all files used by tools, and
is one step closer to enabling genrules inside unselected
namespaces.

Bug: 124313442
Test: genrule_test.go
Test: rule_builder_test.go
Test: m checkbuild
Change-Id: I57c0d5fc8bba216fac4deb972d0d2098593e8963
2020-12-17 10:02:56 -08:00
Colin Cross
a9c8c9f145 Call ctx.InstallFile for uninstallable cc modules
SkipInstall is actually primarily used to prevent making a module
visible to Make, rename it and add new SkipInstall that actually
skips installation without affecting Make.

Call c.SkipInstall() for uninstallable cc modules to allow calling
c.installer.install, which will collect PackagingSpecs for
uninstallable cc modules, allowing them to be used by genrules.

Bug: 124313442
Test: m checkbuild
Change-Id: I8038ed5c6f05c989ac21ec06c4552fb3136b9a7a
2020-12-17 10:02:18 -08:00
Colin Cross
95b07f2b59 Don't copy uninstallable variants of NDK libraries to sysroot
After the next patch libraryDecorator.install will be called for
uninstallable variants of modules, manually filter them out when
copying to the NDK sysroot.

Bug: 124313442
Test: m checkbuild
Change-Id: I28b538d4ae271dc5e27c386d7cfa538ac0ed841b
2020-12-17 10:02:18 -08:00
Treehugger Robot
bb56da8ed0 Merge "Assert android.ApexModule interface for types having ApexModuleBase" am: 1a74be780b am: 7d3e31bd70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530138

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee57f34adcb320ad81cfda202cdd807a6313e4af
2020-12-17 05:11:15 +00:00
Treehugger Robot
7d3e31bd70 Merge "Assert android.ApexModule interface for types having ApexModuleBase" am: 1a74be780b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530138

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9bbf24d1c15c9b1a96386993b08804413654e6c
2020-12-17 04:31:58 +00:00
Treehugger Robot
1a74be780b Merge "Assert android.ApexModule interface for types having ApexModuleBase" 2020-12-17 04:14:35 +00:00
Rupert Shuttleworth
e24ad79074 Merge "Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist." am: e808dae1fd am: 861ea59475
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1532818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67c90bd431d3cc46bfc07726abd578a412bba6c7
2020-12-17 04:01:05 +00:00
Rupert Shuttleworth
861ea59475 Merge "Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist." am: e808dae1fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1532818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7840282d1442b4f09eb5ff5e9b5ae5131276b4e6
2020-12-17 03:46:16 +00:00
Rupert Shuttleworth
e808dae1fd Merge "Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist." 2020-12-17 03:26:12 +00:00
Treehugger Robot
0596c78a7e Merge "arch specific dependencies are supported for apex" am: f1c48afc31 am: 502066e794
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1527546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac527a34246fd30461f70e82202b22d78a079252
2020-12-17 01:24:14 +00:00
Rupert Shuttleworth
534f15708f Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist.
Test: DIST_DIR=/tmp/foo USE_BAZEL=1 m dist and DIST_DIR=/tmp/foo USE_BAZEL=1 m dist installclean
Change-Id: Ibf576d2f3ba506e0f45c30a5dbea69de5c475c9a
2020-12-17 01:01:33 +00:00
Treehugger Robot
502066e794 Merge "arch specific dependencies are supported for apex" am: f1c48afc31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1527546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60d2b63b5099d9306464246e774ff081148509f6
2020-12-17 00:47:34 +00:00
Treehugger Robot
f1c48afc31 Merge "arch specific dependencies are supported for apex" 2020-12-17 00:15:26 +00:00
Patrice Arruda
13de04a373 Merge "Add and update comments in ui/metrics/metrics.go." am: c7ed779e5a am: bc322c2f68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530455

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c57a50dffc8828da345c71facd7cc23ade5c918
2020-12-16 21:00:40 +00:00
Patrice Arruda
bc322c2f68 Merge "Add and update comments in ui/metrics/metrics.go." am: c7ed779e5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530455

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6db58827239f0da2930ac0595ee409c6892b3286
2020-12-16 20:18:52 +00:00
Patrice Arruda
c7ed779e5a Merge "Add and update comments in ui/metrics/metrics.go." 2020-12-16 19:34:56 +00:00
Treehugger Robot
911256b37d Merge "Remove soong_metrics_proto from the import of the protobuf file." am: 2df93e550b am: c3c81eccaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04e8a04d1f8aa895faa2f2cbdac701bb2c875a6e
2020-12-16 18:14:44 +00:00
Treehugger Robot
054155a51a Merge "Add setup_tools performance metrics to Soong protobuf file." am: f747e75119 am: 047954709b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37fde76a3a4b0d7ad1d7b9f41f27b364d97cadd6
2020-12-16 18:14:36 +00:00
Treehugger Robot
c3c81eccaa Merge "Remove soong_metrics_proto from the import of the protobuf file." am: 2df93e550b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20ea1f8c4f0dc00005c7435347104e678b90ffee
2020-12-16 17:55:35 +00:00
Treehugger Robot
047954709b Merge "Add setup_tools performance metrics to Soong protobuf file." am: f747e75119
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb0af7ae50ba7f03239512e48d88866a6c29b1fd
2020-12-16 17:54:55 +00:00
Treehugger Robot
2df93e550b Merge "Remove soong_metrics_proto from the import of the protobuf file." 2020-12-16 17:22:09 +00:00
Treehugger Robot
f747e75119 Merge "Add setup_tools performance metrics to Soong protobuf file." 2020-12-16 17:21:50 +00:00
Christopher Parsons
931f474eed Merge "Use aquery to declare bazel actions in the ninja file." am: 61f6eb6664 am: 964ae6adb3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1524778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0f40d96be8b6ef55aec6e5606f2d4643e0d9cc7
2020-12-16 17:13:32 +00:00
Christopher Parsons
964ae6adb3 Merge "Use aquery to declare bazel actions in the ninja file." am: 61f6eb6664
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1524778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied41063dd51f157650c6396fd4e2b2b183c05bfe
2020-12-16 16:30:48 +00:00
Christopher Parsons
61f6eb6664 Merge "Use aquery to declare bazel actions in the ninja file." 2020-12-16 15:59:27 +00:00
Treehugger Robot
431e41e3b8 Merge "Always track transitive dependencies for host." am: abada78f05 am: dc6328e6f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1531398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83c971512e228e8b2742fbad566cb946774f1565
2020-12-16 13:53:29 +00:00
Treehugger Robot
dc6328e6f1 Merge "Always track transitive dependencies for host." am: abada78f05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1531398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic84e9d8eed6f3c9a530a4b492a62e478f62ca3f6
2020-12-16 13:33:13 +00:00
Treehugger Robot
abada78f05 Merge "Always track transitive dependencies for host." 2020-12-16 13:14:28 +00:00
Colin Cross
ce96b58aa6 Merge "Revert "Sandbox genrule tools"" am: 7cd23e3d02 am: 59d1143f25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530456

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie757cb9e77b95433e676a46e4947f9af750e924c
2020-12-16 03:58:33 +00:00
Colin Cross
59d1143f25 Merge "Revert "Sandbox genrule tools"" am: 7cd23e3d02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530456

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id854555d34bbd02ff17b12f28a68f7ec9a8c5ee8
2020-12-16 03:21:01 +00:00
Colin Cross
7cd23e3d02 Merge "Revert "Sandbox genrule tools"" 2020-12-16 02:53:25 +00:00
Colin Cross
0096047180 Revert "Sandbox genrule tools"
This reverts commit 3a150d6951.

Reason for revert: b/175743249

Bug: 124313442
Bug: 175743249
Change-Id: Id1695df7b83bf057511f856b40cf7d5413030270
2020-12-16 02:52:32 +00:00
Treehugger Robot
7a162fecb3 Merge "versioning macro is exported from prebuilt stubs as well" am: 6a8c18a89b am: a781b0a384
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1527540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa46646bb30f94b53281d29849e12d2c1ccba038
2020-12-16 02:33:34 +00:00
Treehugger Robot
a781b0a384 Merge "versioning macro is exported from prebuilt stubs as well" am: 6a8c18a89b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1527540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6525b99f5e2cc33c0dc1f47c66d583f494ef800a
2020-12-16 01:55:29 +00:00
Kalesh Singh
dcf072887d Merge "Revert "Add android.hardware.memtrack-unstable-ndk_platform"" am: fc0cba0b77 am: cf7a4b306f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb58eafc15ca1eb1d8e58d5a5ebf460ba805510c
2020-12-16 01:46:35 +00:00
Martin Stjernholm
f2635ec434 Always track transitive dependencies for host.
This fixes a regression in https://r.android.com/1515154 when building
the host ART APEX (com.android.art.host).

Test: art/build/apex/runtests.sh
Bug: 166468760
Change-Id: I39a00019b7bfa77a865e7287c66add3566b34d87
2020-12-16 01:34:43 +00:00
Treehugger Robot
6a8c18a89b Merge "versioning macro is exported from prebuilt stubs as well" 2020-12-16 01:31:10 +00:00
Kalesh Singh
cf7a4b306f Merge "Revert "Add android.hardware.memtrack-unstable-ndk_platform"" am: fc0cba0b77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1530882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6b088e69e55ad45f67afbb959fcd3b1fcd76f72
2020-12-16 01:05:13 +00:00
Kalesh Singh
fc0cba0b77 Merge "Revert "Add android.hardware.memtrack-unstable-ndk_platform"" 2020-12-16 00:48:06 +00:00
Kalesh Singh
67d69f0d1c Revert "Add android.hardware.memtrack-unstable-ndk_platform"
Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I4fc71dc5813d10600727a2630c10f5d113f61936
2020-12-16 00:19:38 +00:00
Treehugger Robot
beaec6a2ac Merge "Put external/libchromeos-rs in the Rust allowlist" am: 4d24e65bbf am: b61bc7b3b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518044

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If80ab9916d410e60a5d30251cfc8467b4d3e9a42
2020-12-15 23:51:20 +00:00
Treehugger Robot
b61bc7b3b0 Merge "Put external/libchromeos-rs in the Rust allowlist" am: 4d24e65bbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518044

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc7799378ae4c3aaa37ee254bafde9abefe84653
2020-12-15 23:37:48 +00:00
Patrice Arruda
589826bc1e Add and update comments in ui/metrics/metrics.go.
The metrics.go had missing comments and also did minor code refactoring
to be more in golang best practices.

Bug: b/172917718
Test: m nothing.
Change-Id: Id63e4af3f27b582fc13ef3f988ac5c8707fb9adf
2020-12-15 23:36:01 +00:00