Commit Graph

45248 Commits

Author SHA1 Message Date
Paul Duffin
b4e6408f03 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b am: 063ad070c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I4a5ba8b506a45b2774034d6ea9327472f5026ec3
2021-09-15 13:59:19 +00:00
Paul Duffin
063ad070c0 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I304997b8488094a28ef8b75baaf0d9c4341b1512
2021-09-15 13:44:01 +00:00
Paul Duffin
c2c7f3e49b Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" 2021-09-15 13:29:23 +00:00
Liz Kammer
a31ff68c4a Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9 am: cfbad2bb31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: Iaf63b13709fe06cc437e872d5ab33f9d5fe9d690
2021-09-15 13:05:54 +00:00
Liz Kammer
cfbad2bb31 Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: Ief7a8edb7e82e537a657d9d74f122b1db0629471
2021-09-15 12:53:18 +00:00
Liz Kammer
adfade58a9 Merge "Bp2build: handle embedded structs as blueprint" 2021-09-15 12:39:29 +00:00
Jiakai Zhang
6ff963aacb Preopt APEX system server jars. am: ca9bc98e0c am: 83d0d8ac1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: Id4a6e38a8756aae03fd007eaa8274cf77c5780bc
2021-09-15 11:02:00 +00:00
Jiakai Zhang
83d0d8ac1c Preopt APEX system server jars. am: ca9bc98e0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: If42b905c0636b10881b372efafd3e2f9bc84923c
2021-09-15 10:48:53 +00:00
Jiakai Zhang
ca9bc98e0c Preopt APEX system server jars.
The path to the artifacts will in the form of
/system/framework/oat/<arch>/<encoded-jar-path>@classes.{odex,vdex,art},
where <encoded-jar-path> is the path to the jar file with "/" replaced
by "@". For example,
/system/framework/oat/x86_64/apex@com.android.art@javalib@service-art.jar@classes.odex

There will be a follow-up CL to update ART runtime to recognize
artifacts in that path.

Test: m com.android.art
Bug: 194150908
Change-Id: Ic89fd63c4b1cd565684cead83fc91dae3bc97a4c
2021-09-15 09:01:07 +00:00
Treehugger Robot
c9205db966 Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d am: 780f559584
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: Ib1ce19047afb812c21757eaad89a65c614c3744f
2021-09-15 08:39:29 +00:00
Treehugger Robot
780f559584 Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: If90417ce5553bac5acaf448987a661b757665d5f
2021-09-15 08:24:02 +00:00
Treehugger Robot
709f02707d Merge "Add system/sepolicy/apex to bp2build allowlist" 2021-09-15 08:10:14 +00:00
Treehugger Robot
b2e53db028 Merge "Fix panic when a module has an invalid output path" am: cf6749630a am: 32e5355bab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: I5daad76b1f084938a86c74e316f2adeeb7df2fe1
2021-09-15 04:50:55 +00:00
Treehugger Robot
32e5355bab Merge "Fix panic when a module has an invalid output path" am: cf6749630a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: I972bbb9b99121e1ee4ffb33c0278f239dd61db8f
2021-09-15 04:37:54 +00:00
Treehugger Robot
cf6749630a Merge "Fix panic when a module has an invalid output path" 2021-09-15 04:23:13 +00:00
Cole Faust
64cb7c964a Fix panic when a module has an invalid output path
dep.OutputFile().Path() can panic if the OutputFile
is invalid, so move more of the code into the check
for validity. This changes the go crash into a
build error.

Bug: 158624492
Test: Apply the patchset 1 of ag/11815659, lunch aosp_x86_64-eng, m
Change-Id: Ic8a728be1b570ac73be7b2b9461676f9fd99c266
2021-09-14 17:35:19 -07:00
Guang Zhu
736654b861 Merge "update build rules to use /data/local/tests/unrestricted" am: 7b32612dc4 am: da4d36227f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826231

Change-Id: I7f69d11f6ca9ef9aa6ae4c4b1fe4d98e1d77b528
2021-09-15 00:35:01 +00:00
Treehugger Robot
7181c70efb Merge "Add {.aar} support for android_library" am: db3ff57368 am: 7b3130a459
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617

Change-Id: I4a36a0cf422a476c4a80b47c14ecf4c2e7cd630a
2021-09-15 00:34:53 +00:00
Guang Zhu
da4d36227f Merge "update build rules to use /data/local/tests/unrestricted" am: 7b32612dc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826231

Change-Id: I96945a717032ade148ac6b70ba5a8b02730d43a5
2021-09-15 00:23:32 +00:00
Treehugger Robot
7b3130a459 Merge "Add {.aar} support for android_library" am: db3ff57368
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617

Change-Id: I2404648a8bdea49d13f2c747a75b82002ee172b5
2021-09-15 00:23:18 +00:00
Guang Zhu
7b32612dc4 Merge "update build rules to use /data/local/tests/unrestricted" 2021-09-15 00:22:43 +00:00
Cole Faust
06103c45c5 Fix m product-graph am: 521e951ad4 am: ec84292f1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826630

Change-Id: I81a5f27e68b6c54af7016d71c7c627184f0ea6d5
2021-09-15 00:13:46 +00:00
Treehugger Robot
db3ff57368 Merge "Add {.aar} support for android_library" 2021-09-15 00:04:42 +00:00
Cole Faust
ec84292f1b Fix m product-graph am: 521e951ad4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826630

Change-Id: I5ce93b1a1d70ad7578069621f5a773ba45615f8e
2021-09-14 23:59:16 +00:00
Cole Faust
521e951ad4 Fix m product-graph
`m product-graph` runs a "non-full" build, which skips
some steps to improve performance. One of the steps
it skips is making a .installable_files file. Soong
reads this file and removes any files that were removed
from the list in this file. It errored out if the file
didn't exist. Make soong less strict about the presence
of this file, because if it doesn't exist, there shouldn't
be any installed files to remove either.

Fixes: 168105598
Test: rm -rf out/, m product-graph
Change-Id: I366f7b09d87911f9660d4e08c2d2f097cc04800f
2021-09-14 15:09:42 -07:00
Liz Kammer
37997c404b Add system/sepolicy/apex to bp2build allowlist
Technically, tzdata apex depends on
//system/sepolicy/apex:com.android.tzdata-file_contexts. Builds suceeded
regardless due to bp2build generating a filegroup for all files in a
directory.

This also requires an update to the check in apex/builder.go to address
the fact that outputs (including filegroups) from Bazel in mixed builds
will be in a Bazel out subdirectory. This change also corrects a
potential bug that would not support all subdirectories under
system/sepolicy as golang's path.Match does not treat ** as recursive.

Test: go test apex tests
Test: build/bazel/ci/mixed_droid.sh
Change-Id: I1076d60cf271e4cdd1ea990156ab0a39fcfa6535
2021-09-14 18:00:22 -04:00
Christopher Ferris
64d26813f6 Merge "Make the script python3." am: 2551d2539e am: 5bae558aad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1817676

Change-Id: Ia8b60f62f33ab3f592b36f31431e9dbd75350145
2021-09-14 21:35:00 +00:00
Christopher Ferris
5bae558aad Merge "Make the script python3." am: 2551d2539e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1817676

Change-Id: Ifb6823c57310fee5b1f2c49c54989195890e4ebf
2021-09-14 21:25:55 +00:00
Christopher Ferris
2551d2539e Merge "Make the script python3." 2021-09-14 21:03:01 +00:00
Saeid Farivar Asanjan
1fca301bd2 Add {.aar} support for android_library
Change-Id: I2c392d3dfc545c23495b03d0f236680fd59e1401
2021-09-14 21:02:43 +00:00
Liz Kammer
32a0339340 Bp2build: handle embedded structs as blueprint
For structs that are embedded, Blueprint does not nest under the
embedded name, flattening them into the original struct for blueprint
files (e.g.
9fd2ed93df:proptools/unpack_test.go;l=402-431;drc=3adb2409648d6f8b25354ac47f083dae87731f10).
We should do the same for bp2build.

This will also allow us to embed structs for bp2build conversion
allowing more reuse.

Test: go test bp2build tests
Change-Id: I9ce088462adaf59bffa80bea76cd488e31f98e9d
2021-09-14 14:41:36 -04:00
Treehugger Robot
613d4cefad Merge "Improve the error when srcs field has the wrong type." am: 309a1acb27 am: 9b08c6021f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822025

Change-Id: Iead2d20211ba1abf6ec6755d1f95f0166d304924
2021-09-14 18:28:53 +00:00
Treehugger Robot
9b08c6021f Merge "Improve the error when srcs field has the wrong type." am: 309a1acb27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822025

Change-Id: I3b34c8520bd0aa6da3fedfcaba458989b1cd9f0e
2021-09-14 18:14:03 +00:00
Guang Zhu
83150667ae update build rules to use /data/local/tests/unrestricted
... for native tests. This new location has the appropriate
settings for debuggerd to generate valid backtraces in case
of test binary crash.

Bug: 167308193
Bug: 199904562
Test: compile
Change-Id: Ic106011a79f0aec86896b305616cf5590ab2eb2d
2021-09-14 10:56:47 -07:00
Treehugger Robot
309a1acb27 Merge "Improve the error when srcs field has the wrong type." 2021-09-14 17:55:33 +00:00
Paul Duffin
f7b3d0d317 Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag
Bug: 195754365
Test: m nothing
Change-Id: Id4ef6f8be54c60a1f269d7e7c46a8dcb715fcca4
2021-09-14 17:26:14 +01:00
Alan Viverette
59da3f7dc9 Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" am: b89663b7d9 am: 4e6b932bd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825712

Change-Id: Iad76f51f6ac3b347728b1462633de46427dba674
2021-09-14 15:28:58 +00:00
Rob Seymour
f87696ed8c Merge "Add module based host-tools snapshot" am: f6c37cc87d am: dc2cc0d8d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1793067

Change-Id: I05d5d44fddfc8c8dd8e59dd64bb76024bbbfbf66
2021-09-14 15:28:48 +00:00
Alan Viverette
4e6b932bd4 Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" am: b89663b7d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825712

Change-Id: Id546d60af089384ec93eb5952dbfba076300c877
2021-09-14 15:08:58 +00:00
Alan Viverette
b89663b7d9 Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" 2021-09-14 15:04:28 +00:00
Rob Seymour
dc2cc0d8d7 Merge "Add module based host-tools snapshot" am: f6c37cc87d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1793067

Change-Id: I3a2bb2459677c14e3e99d654ed5ffb9b7dd09b21
2021-09-14 15:04:01 +00:00
Rob Seymour
f6c37cc87d Merge "Add module based host-tools snapshot" 2021-09-14 14:47:03 +00:00
Martin Stjernholm
25a69de8de Improve the error when srcs field has the wrong type.
In particular it's useful to print the module, since the panic is
delayed from the init call.

#codehealth

Test: m nothing
Change-Id: Ia91127be83d8a9ce08cf0c08bc3f13fce7be14af
2021-09-14 00:33:47 +01:00
Christopher Ferris
8e5feaa1df Make the script python3.
Test: Ran the python version of the script and the python3 version
Test: and verified the output is the same. This is for all three
Test: outputs (html, text, xml).
Test: Builds without an error.
Change-Id: I344504a4351c14e00caeb109c5507a60fb6be05a
2021-09-13 14:54:01 -07:00
Liz Kammer
0b31f81b5c Merge "Split local/absolute include into attributes" am: 04e0a1551d am: 953bf91c49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824019

Change-Id: Ieda111c8f5075c8ebd2a325f8546fcd6a9b3b136
2021-09-13 21:53:50 +00:00
Liz Kammer
953bf91c49 Merge "Split local/absolute include into attributes" am: 04e0a1551d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824019

Change-Id: I05e64f79fd95836e92630941f276e64fd6c5b98f
2021-09-13 21:37:32 +00:00
Rob Seymour
925aa09ea1 Add module based host-tools snapshot
Add new module:
host_snapshot {
    name: "host-snapshot"
    deps: [
      (list of host tools)
    ],
    ...
}

Package host tools using android.PackagingBase to capture host tools and transitive packaging data.
Add JSON meta data to snapshot that allows snapshot to be installed via development/vendor_snapshot/update.py

Add support to generate a fake host snapshot of all host modules that is used to detect required
modules via development/vendor_snapshot/update.py.

Bug: 192556798
Bug: 194799048
Bug: 192896149
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist -- check snapshot exists in dist

Change-Id: I849c4db801cd858408f6fe6a3ce69262a23a5be9
2021-09-13 21:29:14 +00:00
Liz Kammer
04e0a1551d Merge "Split local/absolute include into attributes" 2021-09-13 21:21:09 +00:00
Treehugger Robot
4bb420480a Merge "Change default to require licenses property." am: 7bb0238418 am: ec01d2d719
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818661

Change-Id: I7e92a7d5e1ac3ab1bdeebe4137256f35c1eba5d9
2021-09-13 19:48:44 +00:00
Treehugger Robot
ec01d2d719 Merge "Change default to require licenses property." am: 7bb0238418
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818661

Change-Id: Ie6e749f3f9acd03c287b845c4e54a326383240b4
2021-09-13 19:39:03 +00:00