tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
57688 commits 1 branch 0 tags 115 MiB
Commit graph

4494 commits

Author SHA1 Message Date
Treehugger Robot
804d04f36d Merge "Allowlist more cc mainline modules blockers" am: d9cb4b746c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132795

Change-Id: Id89b82571da8dc904d254cc7f761226106ad45ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 19:10:12 +00:00
Treehugger Robot
d9cb4b746c Merge "Allowlist more cc mainline modules blockers" 2022-07-01 18:53:07 +00:00
Treehugger Robot
9fe821b0c6 Merge "Don't pass host cross linux musl modules to Make" am: f47fe38686 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139099

Change-Id: I97e79b3df1e605d20276f06c407a3ce74a1edfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 17:37:55 +00:00
Treehugger Robot
f47fe38686 Merge "Don't pass host cross linux musl modules to Make" 2022-07-01 17:11:41 +00:00
Liz Kammer
63367e1da9 Allowlist more cc mainline modules blockers 
Test: mixed_droid.sh
Change-Id: Ice133b88d3420d9b976d1632da3e7e5da6bb5c3c
 2022-07-01 12:33:59 -04:00
Treehugger Robot
f4da9403f3 Merge changes I93edfd61,Icd23b542,I58c84607,Icfa73a75 am: 4d2f767217 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139101

Change-Id: I35551b07799c29cb56e2ffdaf7c1693b23f4f8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 13:10:11 +00:00
Treehugger Robot
4d2f767217 Merge changes I93edfd61,Icd23b542,I58c84607,Icfa73a75 
* changes:
  Pass -fno-sanitize=vptr,function for musl
  Use musl rust prebuilts for USE_HOST_MUSL=true
  Don't package host cross modules in javaFuzzPackager
  Add rust musl arm and arm64 toolchains
 2022-07-01 12:46:58 +00:00
Sasha Smundak
966994af92 Reformat the test to make them more readable. am: e3cf1abefc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2142353

Change-Id: I5dc19256f8603101845dc56a53b87902049e3042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 23:30:24 +00:00
Sasha Smundak
e3cf1abefc Reformat the test to make them more readable. 
Test: treehugger
Change-Id: I28ccd531a5dadcee3cbdebd5f5ba6db1605662d9
 2022-06-30 14:20:55 -07:00
Usta Shrestha
5cc4165702 Merge "null build upon repeated mixed build" am: 86363835ae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095253

Change-Id: I08d32ec6550688fce86631a942add1de2d243392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 14:31:15 +00:00
Usta Shrestha
86363835ae Merge "null build upon repeated mixed build" 2022-06-30 14:11:20 +00:00
Sasha Smundak
ab8c3df31a Fix config string for the generic target. am: 9d46dcf908 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121034

Change-Id: I7a11aae2cab98e774696a15e8fa65ba485461e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:52:59 +00:00
Sasha Smundak
9d46dcf908 Fix config string for the generic target. 
For the generic target (i.e, arch == "common" and os == Device), the config
 string should be "target|common", not "x86_64|common".
 Also renamed local variable from `os`.

Bug: 232085015
Test: treehugger
Change-Id: I36e696203f207dd295ed7f109b7c07b576ebf3c2
 2022-06-29 18:30:36 -07:00
Colin Cross
9a027be6bc Don't pass host cross linux musl modules to Make 
Make doesn't understand host cross linux musl modules, don't pass
them to make.  Continue passing them to make when USE_HOST_MUSL=true
is set.

Bug: 236052820
Test: builds with linux musl arm64 host cross configured
Change-Id: Id8b90ca0fa698fdf658156b458cc385387768414
 2022-06-28 15:16:15 -07:00
Colin Cross
39a1814f24 Don't package host cross modules in javaFuzzPackager 
Normally the host cross OS is windows, which only builds a few opted-in
modules.  When the host cross OS is set to linux_musl it builds all
modules that haven't explicitly opted out, producing linux_musl_common
variants of java modules.  Filter these out of javaFuzzPackager to
avoid conflicts with the linux_glibc_common modules.

Host cross common variants targets were missing the HostCross flag,
so also set it in getCommonTargets.

Bug: 236052820
Test: builds with linux_musl arm64 host cross enabled
Change-Id: I58c846076091bee7df50016c240a176c039c42e9
 2022-06-28 15:16:15 -07:00
Xin Li
313fdb5812 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I1421fb0dbcdb759281259abfae7bddc9aecdaa56
Change-Id: If059be00e6bdaaa94171b456afae1d585540639c
 2022-06-28 21:23:06 +00:00
Usta Shrestha
ef92225a67 null build upon repeated mixed build 
no implicit deps on bazel-tools

Test: USE_BAZEL_ANALYSIS=1 ../bazel/ci/incremental_mixed_build.sh
Bug: b/216194240
Change-Id: Ibbd87c6a6cc2fddf21fba37a6bb4e72adc209576
 2022-06-28 15:37:12 -04:00
Vinh Tran
dd3ea92609 Merge "Replace API level codename with number" 2022-06-28 13:39:37 +00:00
Paul Duffin
23477d79f6 Merge "Add protected_properties support in defaults modules" 2022-06-28 12:02:01 +00:00
Vinh Tran
f192474a60 Replace API level codename with number 
This CL fixes a bug when Soong pass `-target` with a non-digit suffix in Clang. As mentioned in b/236753843, Clang's version parsing expects to see an integer in the target string so it ignores the
S suffix.

Test: m gwp_asan_crash_handler && make sure -target is aarch64-linux-androidS instead of aarch64-linux-android31
Test: go test -run ^TestNonDigitMinSdkVersionInClangTriple$ android/soong/cc
Bug: 236753843
Change-Id: I258ecc52083dbf3471d23cf310e0ad54440f1908
 2022-06-28 01:33:18 +00:00
Vinh Tran
8d4ae9cbf5 Merge "Deprecate depfile in gensrcs" 2022-06-27 21:17:27 +00:00
Colin Cross
2bce04f76f Merge "Add linux_musl arm+arm64" 2022-06-27 18:37:07 +00:00
Cole Faust
745ae265c2 Merge "Allowlist bazel-built partition directories" 2022-06-27 17:20:38 +00:00
Vinh Tran
140d588a3d Deprecate depfile in gensrcs 
All existing gensrsc modulePartners who use the property can use BUILD_BROKEN_DEP_FILE to bypass the error

Test: CI
Bug: 179452413
Fix: 179452413
Change-Id: I7cd39484b43eba693d79188b9a374f192198f90f
 2022-06-27 12:07:27 -04:00
Lukács T. Berki
034206cb90 Merge "Add godoc for TransitionMutator." 2022-06-27 06:52:42 +00:00
Lukacs T. Berki
0e691c1119 Add godoc for TransitionMutator. 
Test: Presubmits.
Change-Id: I4f2e40afe1f16f4020403d2a03930b0f51fee71d
 2022-06-27 08:52:08 +02:00
Colin Cross
a9b2aacf07 Add linux_musl arm+arm64 
Add toolchains to support cross compiling to aarch64-linux-musl and
arm-linux-musleabihf.

Bug: 236052820
Test: build arm and arm64 musl sysroots
Change-Id: I47a9322929baff2492c6e8db989ece01fcbeb133
 2022-06-24 13:46:36 -07:00
Usta Shrestha
2bc1cd96ef cosmetic: go warnings 
Test: N/A
Bug: N/A
Change-Id: I9bad2cecb350e9539344ad7d81d83c93c31e54cd
 2022-06-23 14:14:05 -04:00
Usta Shrestha
acd5a0c080 paths in depfiles are relative to $OUT_DIR 
Test: USE_BAZEL_ANALYSIS=1 m libc droid
Bug: b/232250671
Change-Id: I7a570894371bd31339ab0cf3c619c30b3cf8cd73
 2022-06-23 14:14:01 -04:00
Christopher Ferris
f7d0e02eab Merge "Remove reference to libbacktrace." am: 2ff57f9d00 am: dc30dcb4e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132416

Change-Id: I2803614c814721f845037f4adbbfde7d3c77b94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 21:14:07 +00:00
Oriol Prieto Gascó
7d7bc5bef1 Merge "Hard-code apex_available handling for the btservices apex" into tm-dev am: 3bb9d7a8d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18972588

Change-Id: I5c6cc4bc32174ba0739d7ed6b42ae0b1685c4ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:43:25 +00:00
Usta Shrestha
f4887dfb7a cosmetic changes am: 16ac13506e am: ed060fa87b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132596

Change-Id: I834d871fdacd6ab561128b023c1b367854a63589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:34:07 +00:00
Christopher Ferris
51506684f2 Remove reference to libbacktrace. 
Bug: 120606663

Test: Builds.
Change-Id: Iefd6a60937a79155dd63ec79c66b347d5d1af01b
 2022-06-22 10:30:05 -07:00
Usta Shrestha
16ac13506e cosmetic changes 
Test: m nothing
Bug: N/A
Change-Id: Ia74a09a6ee42560562e2e1a15e972860e77a5724
 2022-06-22 11:02:43 -04:00
Cole Faust
42c48ac133 Allowlist bazel-built partition directories 
Bug: 232430910
Test: b test //build/bazel/tests/partitions:image_contains_apex_test --test_output=errors
Change-Id: Ie3f61a590d25310ff401e3575aaeecd6551f2404
 2022-06-21 17:47:26 -07:00
Bob Badour
5f35225082 Fix escaping for package_name am: a10d5a2746 am: d5a951da99 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133016

Change-Id: I053298497b76d6d5738ad5120affdcf62931c487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 20:51:32 +00:00
Bob Badour
a10d5a2746 Fix escaping for package_name 
Bug: 235333302

Test: m droid dist
Change-Id: I6e52b960be4171a9510edd4f2857f13cc3f54bc0
 2022-06-21 11:12:01 -07:00
Jiyong Park
2f36d8e906 Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 am: 2e4bc136fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133112

Change-Id: I28ccd4839366114cf5958aa382e10c2e45f6d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:34:21 +00:00
Jiyong Park
3707384f02 buildinfo_prop generates ro.build.version.known_codenames 
The sysprop is now generated as the corresponding Make variable
PLATFORM_VERSION_KNOWN_CODENAMES is imported.

Bug: 236602028
Test: atest ComposHostTestCases
Change-Id: Ife7e87ce5de65b57c51d5565e288807cf8360b28
 2022-06-21 10:13:42 +09:00
Oriol Prieto Gasco
8132fbf8c1 Hard-code apex_available handling for the btservices apex 
Bug: 236192423
Test: TH
Change-Id: Ie095ae22704a80e0ec171b1bb3fdc995f95a1c64
 2022-06-19 23:13:25 +00:00
Lukács T. Berki
28e86cdebd Merge "Migrate sanitizers to transition mutators." am: 5ad0185b63 am: c0d25950f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123434

Change-Id: I05b8668cd8b2b24c31bc07633e639f0492aa0cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 20:17:49 +00:00
Lukacs T. Berki
6c71676d6c Migrate sanitizers to transition mutators. 
The logic is not 100% provably the same since HEAD was quite
confusing at some points, but I did make an effort to preserve
functional equivalence.

In case that effort was not enough, it should be pretty easy to
tweak the logic at HEAD since it's still quite malleable.

Bug: 231370928
Test: Presubmits.
Change-Id: I17b2efbfb5c4d0aedd922caed54ff8d857e578df
 2022-06-18 06:20:28 +02:00
Paul Duffin
d6f7851dee Merge "Treat <x> and <x>_compressed prebuilt APEXes as being equivalent" 2022-06-14 18:49:49 +00:00
Yu Liu
110f78ca8e Merge "Support cc code coverage for mixed build" am: 57c1edc4d9 am: 56868c621b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2103671

Change-Id: Ibe7fab143ee1ebbdbe4df73c1d173cc9c3c5a315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 20:16:29 +00:00
Yu Liu
57c1edc4d9 Merge "Support cc code coverage for mixed build" 2022-06-13 18:57:50 +00:00
Romain Jobredeaux
9e8e7d7b86 Merge "Allow empty zip file in extra files in install command." into tm-dev 2022-06-13 13:24:06 +00:00
Paul Duffin
5556c5f17a Treat <x> and <x>_compressed prebuilt APEXes as being equivalent 
(cherry picked from commit 1aa50564c7)

When extracting dex files from prebuilt APEXes the build fails if it
finds two or more prebuilt APEXes that could provide the dex files.
This change treats <x> and <x>_compressed APEXes as being the same
and always selects the uncompressed APEX.

Bug: 235284603
Test: m nothing
      # Added TestDuplicateButEquivalentDeapexersFromPrebuiltApexes
      # Failed without this change, works with it.
Merged-In: I805cb9dfa9f590c91585d75c4f4586b212b73d41
Change-Id: I805cb9dfa9f590c91585d75c4f4586b212b73d41
 2022-06-13 13:16:53 +00:00
Treehugger Robot
af5e7280a5 Merge "Allowlist apexer for bp2build" am: ab12f792c0 am: d2c842be31 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115757

Change-Id: I939c1813093cdb3a09f9508ec03b186e2d298e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 00:46:24 +00:00
Treehugger Robot
ab12f792c0 Merge "Allowlist apexer for bp2build" 2022-06-13 00:05:53 +00:00
Paul Duffin
5c24484a50 Merge "Treat <x> and <x>_compressed prebuilt APEXes as being equivalent" into tm-dev am: 60c0b9ec9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18801840

Change-Id: Ib7e45cf518950d65e7b87da42a0f5883266b0c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-11 12:32:16 +00:00