Commit Graph

56017 Commits

Author SHA1 Message Date
Anton Hansson
ddf8c1bed9 Revert "Relax apex package restriction for T+ jars"
This reverts commit 1fdd6ca88a.

Reason for revert: b/205289292 tracks the real fix for this

Test: presubmit
Change-Id: I5a2edaf4f930dafa26659f85d9425e9041c72275
(cherry picked from commit 1d016c50d0ee18ebc81ce7966e616b9936befd5a)
2022-03-31 15:47:12 +00:00
Colin Cross
652dbcaa9a Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4 am: e3f28d26a6 am: c068a7d423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I45f717f96780715af04c0c4eef61bd4db763cc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:51:05 +00:00
Colin Cross
a152356349 Switch to libunwind to remove dependency on libgcc for musl am: 441898c285 am: b7ea2f5c7e am: d1b5f338e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I015e1b22dbcc2dbfdd9c2eb053d8ae94bfd8fcd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:51:00 +00:00
Colin Cross
c068a7d423 Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4 am: e3f28d26a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I7e197d725c670fbf0e33156549d33af2cc028b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:29:43 +00:00
Colin Cross
d1b5f338e5 Switch to libunwind to remove dependency on libgcc for musl am: 441898c285 am: b7ea2f5c7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I4a19e594ee501b2fc88eccd235eb9538930c4bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:29:38 +00:00
Colin Cross
e3f28d26a6 Merge changes from topic "musl_clang_runtimes" am: 0f2a718ce4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980450

Change-Id: I89cabdde43dea0e5b2505f09d80d67356484433e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:11:59 +00:00
Colin Cross
b7ea2f5c7e Switch to libunwind to remove dependency on libgcc for musl am: 441898c285
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1983628

Change-Id: I1520b92b0fa7a3266915cd20dd45019df761a849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 04:11:55 +00:00
Treehugger Robot
94f6610eb7 Merge "android_system_image only packages "system" items" am: 0cfe1f43f7 am: 578ea8d076 am: db0478589e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: I95ddce4b6b8c9d4b620ef1b3548d8da31d3ab609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:56:15 +00:00
Colin Cross
0f2a718ce4 Merge changes from topic "musl_clang_runtimes"
* changes:
  Enable sanitizers for musl
  Switch to libunwind to remove dependency on libgcc for musl
2022-03-30 03:54:38 +00:00
Treehugger Robot
db0478589e Merge "android_system_image only packages "system" items" am: 0cfe1f43f7 am: 578ea8d076
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: I6f04476705efce0fa6f1f7edc7a228722bdb878b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:35:26 +00:00
Treehugger Robot
578ea8d076 Merge "android_system_image only packages "system" items" am: 0cfe1f43f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030223

Change-Id: Icd1602f08035e2c6eea39eacc0cf448a6b04fe31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:18:17 +00:00
Treehugger Robot
0cfe1f43f7 Merge "android_system_image only packages "system" items" 2022-03-30 02:58:58 +00:00
Rob Seymour
aafaf3adff Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674 am: d7e3a12438 am: 226b5f4589
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: I1cf825ac4998edfc3fb676f5965983a47da951d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:49:43 +00:00
Rob Seymour
226b5f4589 Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674 am: d7e3a12438
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: Iaa4355b0d76329c47b6370f855a8cbd0650a1d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:25:33 +00:00
Rob Seymour
d7e3a12438 Add pre-built attribute to host module definition for fake snapshot. am: 9e5cc8a674
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044967

Change-Id: Iadd0cc05e885f2b39156aa1446bd55e2d1cea555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:06:53 +00:00
Colin Cross
441898c285 Switch to libunwind to remove dependency on libgcc for musl
The libgcc dependency is only used for _Unwind* symbols, remove
it now that libc_musl.so embeds libunwind.a.

Bug: 215802826
Test: m USE_HOST_MUSL=true host-native
Change-Id: I1ad4c1435fc0090c6df2d50d542d2203dfb94d7b
2022-03-29 13:35:17 -07:00
Colin Cross
ed12a04a3e Enable sanitizers for musl
Now that we provide runtimes built for musl, enable the sanitizers
when targeting musl.

Bug: 215802826
Test: m USE_HOST_MUSL=true host-native
Change-Id: Id17513ee305274874c31e9c99ce4faeff4a1c057
2022-03-29 13:35:17 -07:00
Rob Seymour
9e5cc8a674 Add pre-built attribute to host module definition for fake snapshot.
The host-snapshot provides host tools via prebuilt modules.
Having 2 prebuilts of the same module in a source tree leads to a build
time error.   Add new attribute when building the fake snapshot to
indicate that the host tool contains a prebuilt version.

When installing the host snapshot the user can opt not to include
modules that have a prebuilt version.

Bug: 225890931
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist
Change-Id: I044a92a280536f9c5ec93dcb277a5e5568cc4e42
2022-03-29 16:08:43 +00:00
Ram Muthiah
e907043def Merge changes from topic "refactor-packagingbase" am: ac38c0bb93 am: ad2c724bb7 am: 314e72ab6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033505

Change-Id: Ibb88bda311be1ace7adcd7d972f343ec648a61bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:31:02 +00:00
Ivan Lozano
a9a8f26255 Merge "rust: rust_proc_macro host snapshot support." am: 72cbf5888b am: 77218bb2ae am: 06de3f94b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042225

Change-Id: Ifcde1fb932aaddbf6e14d659d3a969ddbf7d8522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:30:46 +00:00
Treehugger Robot
fc676d3bb0 Merge "Add values to json module graph" am: 4242115d59 am: 9fadff9a6b am: feda277e91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036896

Change-Id: I5368019447475cab2cac78ecb912515d17355834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:30:34 +00:00
Colin Cross
cd811c0536 Merge "Use turbine instead of kapt for kotlin annotation processors" am: edd46702e1 am: 9ad80f6486 am: eed308db9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030724

Change-Id: I2882ee4246da7ce663c92548dc0aef5b57f0c0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:30:07 +00:00
Ram Muthiah
314e72ab6a Merge changes from topic "refactor-packagingbase" am: ac38c0bb93 am: ad2c724bb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033505

Change-Id: I9c47fc130896c30ab9e23f02b3b2a5eb6905aa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:33:13 +00:00
Ivan Lozano
06de3f94b9 Merge "rust: rust_proc_macro host snapshot support." am: 72cbf5888b am: 77218bb2ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042225

Change-Id: If0d6c881cceed6269433c2ca932ffbec4f8d7ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:32:50 +00:00
Ram Muthiah
ad2c724bb7 Merge changes from topic "refactor-packagingbase" am: ac38c0bb93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033505

Change-Id: Id522cf99f18a14acb16227188ef027e2b504c5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:08:52 +00:00
Ivan Lozano
77218bb2ae Merge "rust: rust_proc_macro host snapshot support." am: 72cbf5888b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042225

Change-Id: I2c408bde100546292c09e661ec076d739661e30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:08:27 +00:00
Ram Muthiah
ac38c0bb93 Merge changes from topic "refactor-packagingbase"
* changes:
  Move GatherPackagingSpecs out of CopyDepsToZip
  Keep 'partition' in PackagingSpec
2022-03-29 13:45:22 +00:00
Ivan Lozano
72cbf5888b Merge "rust: rust_proc_macro host snapshot support." 2022-03-29 13:29:24 +00:00
Jooyung Han
0fbbc2b0d4 android_system_image only packages "system" items
android_system_image filers packaging items installed outside "system"
partition.

Some packaging items install related items to different partitions but
putting them altogether to android_system_image doesn't make sense.
(android_system_image is suppposed to be "system" partition)

To be specific, this filters out "apex" partition items.  "apex"
partition is used by APEX installation to install APEX contents to paths
similar to activated paths on device so that symbol lookup works well
with APEX contents.

Bug: 225121718
Test: atest MicrodroidHostTestCases
Test: debugfs <intermediate>/microdroid.img -R 'ls system'
  shows no "com.android.runtime"
Change-Id: Ibc3d85ead2fda99e231132ce8ab9ccf1cc9317b7
2022-03-29 07:56:02 +09:00
Treehugger Robot
feda277e91 Merge "Add values to json module graph" am: 4242115d59 am: 9fadff9a6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036896

Change-Id: I204adbe7a412dd4d92145551ea61eba1cf83d8d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 21:38:45 +00:00
Treehugger Robot
9fadff9a6b Merge "Add values to json module graph" am: 4242115d59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036896

Change-Id: Ie014ca08c6d124185fbb4a7ff1a8ee65bb46de25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 20:47:51 +00:00
Treehugger Robot
4242115d59 Merge "Add values to json module graph" 2022-03-28 20:25:43 +00:00
Colin Cross
a8e2151a30 Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44 am: 79e93d626a am: b420d23c16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I1a2cc01787a5d3524755ca14a7ca46bd5d582c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:23:05 +00:00
Colin Cross
eed308db9e Merge "Use turbine instead of kapt for kotlin annotation processors" am: edd46702e1 am: 9ad80f6486
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030724

Change-Id: I4fa56fbcd8d1c01b742f4ab610b52713b9048c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:47:13 +00:00
Colin Cross
b420d23c16 Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44 am: 79e93d626a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I5740d64c1032b88c91acafee32539e16d846a4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:46:49 +00:00
Colin Cross
9ad80f6486 Merge "Use turbine instead of kapt for kotlin annotation processors" am: edd46702e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030724

Change-Id: I6063a9ba1100ae82bdddb8a49d3860d2ed196c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:28:20 +00:00
Colin Cross
79e93d626a Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I88dfba08c5e64a7da4673dc8674e8ea579cc85b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:27:18 +00:00
Colin Cross
edd46702e1 Merge "Use turbine instead of kapt for kotlin annotation processors" 2022-03-28 18:07:14 +00:00
Colin Cross
e311abcd44 Merge "Don't use ziptime or --temp_dir for turbine" 2022-03-28 18:00:49 +00:00
Jooyung Han
e7965c30ad Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f45a am: 42f6e1f4f0 am: 0ea9f70a8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045010

Change-Id: I5f42f52400716a4891ef7c9640f27d2f95d32454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 10:40:49 +00:00
Jooyung Han
0ea9f70a8a Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f45a am: 42f6e1f4f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045010

Change-Id: If522c523ad79747f896c51914c4eef62e4254b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 10:27:00 +00:00
Jooyung Han
42f6e1f4f0 Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f45a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045010

Change-Id: Ib2b1bc21f45982e2a2fbc93a71bccb05724c00fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 10:08:28 +00:00
Jooyung Han
76c255f45a Merge "Revert "Add a tool to list contents of .img file"" 2022-03-28 09:48:10 +00:00
Jooyung Han
1df464a90b Revert "Add a tool to list contents of .img file"
Revert submission 2041990-microdroid-contents

Reason for revert: b/227144320 (broken build)
Reverted Changes:
Ie2f471d39:Add the golden list of microdroid contents
I7c4fca184:Add a tool to list contents of .img file

Change-Id: If2b5d6cb1325cb17ef2bdc4f13ded003ab2dd6d7
2022-03-28 09:44:33 +00:00
Treehugger Robot
48dbbad510 Merge "Add a tool to list contents of .img file" am: 23ce5b4ca2 am: 44e7cb664a am: 7f1f1b7306
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041990

Change-Id: I54ce7470ff6ad7c5bea1c1dbf4e44872918ac575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 05:53:15 +00:00
Treehugger Robot
7f1f1b7306 Merge "Add a tool to list contents of .img file" am: 23ce5b4ca2 am: 44e7cb664a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041990

Change-Id: Idd191b0ca3e5fb21ab60f2259efc670be55974b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 05:39:16 +00:00
Jooyung Han
a883428293 Move GatherPackagingSpecs out of CopyDepsToZip
This gives a PackageModule a chance to filter/customize the contents of
resulting package.

Bug: 225121718
Test: m (no changes)
Change-Id: I45505e8234dff42201dc40d4f038e7b08eea89f0
2022-03-28 14:29:14 +09:00
Jooyung Han
99c5fe6a38 Keep 'partition' in PackagingSpec
Add a property 'partition' to PackagingSpec and fill it when
PackagingSpec is created.

This will enable PackageModule to filter PackgingSpec based on
partition. (Will be used in a follow-up change)

Bug: 225121718
Test: m (nothing changes)
Change-Id: I7657edd380e215df66bae57d8b07dd4181841fdf
2022-03-28 14:29:14 +09:00
Treehugger Robot
44e7cb664a Merge "Add a tool to list contents of .img file" am: 23ce5b4ca2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041990

Change-Id: Ie1811ccc3aaa56456f94c57e7dc4efcd6f817780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 05:24:07 +00:00
Treehugger Robot
23ce5b4ca2 Merge "Add a tool to list contents of .img file" 2022-03-28 05:06:55 +00:00