StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,798 Commits 1 Branch 0 Tags
d6954f0b0f1eb54cb7d38b32d10f0a15d0b18d14
Commit Graph

45798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiakai Zhang
d6954f0b0f Merge "Add more tests for dexpreopting." am: 40eb3b3e94 am: 39f65b16e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840057

Change-Id: I529d559b155003f25bb98683ef974be45754cae9
 2021-10-13 03:53:16 +00:00
Jiakai Zhang
39f65b16e3 Merge "Add more tests for dexpreopting." am: 40eb3b3e94 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840057

Change-Id: I43ca5e97e606a269068e07cf0cca2c6bd0d082c8
 2021-10-13 03:28:57 +00:00
Jiakai Zhang
40eb3b3e94 Merge "Add more tests for dexpreopting." 2021-10-13 03:17:11 +00:00
Jingwen Chen
f561d7ca91 Merge "Convert cpp_std to be an attribute instead of a copt." am: e466cc7ea6 am: 91368f3a67 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853143

Change-Id: Id25a269af25d3e90e5f4ed38a49f0411071065af
 2021-10-12 23:47:04 +00:00
Jingwen Chen
91368f3a67 Merge "Convert cpp_std to be an attribute instead of a copt." am: e466cc7ea6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853143

Change-Id: I77c52e9b17e72664a0de3dd2deab88986efcf264
 2021-10-12 23:34:04 +00:00
Jingwen Chen
e466cc7ea6 Merge "Convert cpp_std to be an attribute instead of a copt." 2021-10-12 23:13:53 +00:00
Liz Kammer
c2ac7f1d74 Merge "bp2build: Improve handling of generated_sources" am: 7e1956643c am: b3e79728ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1851764

Change-Id: I5c61b10c6d279a3cba9b9c1b741ee85a8497b1e6
 2021-10-12 18:00:35 +00:00
Liz Kammer
b3e79728ad Merge "bp2build: Improve handling of generated_sources" am: 7e1956643c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1851764

Change-Id: I1560405c38f158e997e7174315efa18d287a11ee
 2021-10-12 17:42:45 +00:00
Liz Kammer
7e1956643c Merge "bp2build: Improve handling of generated_sources" 2021-10-12 17:29:23 +00:00
Yu Liu
50194cac72 Merge "Change the approach to decide whether to upload metrics." am: f6f010b2de am: 272c1a61bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780505

Change-Id: I2cd4fdefbb684d9c95031a451bf24a59cc00ebe5
 2021-10-12 16:30:30 +00:00
Yu Liu
272c1a61bc Merge "Change the approach to decide whether to upload metrics." am: f6f010b2de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780505

Change-Id: I6b02987239c0d4e521ed3365b2a4408ef29a03f3
 2021-10-12 16:17:08 +00:00
Yu Liu
f6f010b2de Merge "Change the approach to decide whether to upload metrics." 2021-10-12 16:02:54 +00:00
Jiakai Zhang
470b7e22a7 Add more tests for dexpreopting. 
This CL adds more tests to ensure that dexpreopted files are generated
and APEXes depends on them.

Bug: 201371822
Test: m nothing
Change-Id: I407ad54c55cbca9ef78bbd335e95d4b765e174a0
 2021-10-12 03:25:52 +00:00
Treehugger Robot
9b0af456d4 Merge "Installation routine for rust is similar to that of cc" am: 4af0d002a5 am: 0573238cbf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843014

Change-Id: I3e855db9d5a51f143d09ec175a8ca037f0a47a99
 2021-10-12 00:34:37 +00:00
Treehugger Robot
0573238cbf Merge "Installation routine for rust is similar to that of cc" am: 4af0d002a5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843014

Change-Id: Ib91d4b5b895d650856ffeb03576636431d37466a
 2021-10-12 00:21:22 +00:00
Treehugger Robot
4af0d002a5 Merge "Installation routine for rust is similar to that of cc" 2021-10-12 00:05:37 +00:00
Yu Liu
7f93dcbf6e Rename desc to description in PerfInfo am: 37c3dd3276 am: 859b16bcd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842577

Change-Id: Ib263b959b2ab642674213674b128aca150befe9d
 2021-10-11 21:30:08 +00:00
Yu Liu
859b16bcd7 Rename desc to description in PerfInfo am: 37c3dd3276 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842577

Change-Id: I7bb3e332d8c83e5a41edf4d211c5da3422172735
 2021-10-11 21:15:19 +00:00
Yu Liu
6e13b40628 Change the approach to decide whether to upload metrics. 
1. Don't upload if the uploader binary is not present.

Bug: b/193703183
Test: Run the following tests locally:
1. run "go test ." in build/soong/ui/build
2. create vendor/google/misc/metrics_uploader_prebuilt/metrics_uploader.sh
and run m nothing to ensure metrics_uploader.sh was called
3. remove the file created in step 2 then run m nothing and ensure it
doesn't attempt uploading

Change-Id: I081a5510b3f30480720c3e7dd235623c805fa7a4
 2021-10-11 21:05:00 +00:00
Liz Kammer
222bdcff5c bp2build: Improve handling of generated_sources 
Test: build/bazel/ci/bp2build.sh
Change-Id: Id5f8b6ae9bbf1e90d72854daafb8b1f86f7241ea
 2021-10-11 14:15:51 -04:00
Steven Moreland
5652357cbc Merge "Allow defaults in java_genrule modules" am: 371dc53d18 am: f11c08ab55 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850961

Change-Id: I11bf3198f2944ef61a55c24b4867975f8565ffd0
 2021-10-11 18:15:31 +00:00
Yu Liu
37c3dd3276 Rename desc to description in PerfInfo 
Bug: 201326605
Test: Ran go unit tests and verified the generated soong_metrics file.
Change-Id: I3ff0aa11e39f0a9862638706ae50550c78030cca
 2021-10-11 11:11:45 -07:00
Steven Moreland
f11c08ab55 Merge "Allow defaults in java_genrule modules" am: 371dc53d18 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850961

Change-Id: Ied4891a346b137a2666ce01cb27297f1feae2f88
 2021-10-11 17:58:49 +00:00
Steven Moreland
371dc53d18 Merge "Allow defaults in java_genrule modules" 2021-10-11 17:47:22 +00:00
Jingwen Chen
5b11ab1a69 Convert cpp_std to be an attribute instead of a copt. 
This attribute is then converted into a feature in cc_library_static.

Fixes: 202518741
Test: CI
Change-Id: I070b56a1e96680ffad0466d085caaab2e9308ebc
 2021-10-11 17:44:33 +00:00
Anton Hansson
3461a8a266 Merge "Update reference to merged services txt" am: 6fcddda43c am: 776a2bcb7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850001

Change-Id: I90a5016b297d0935b70c920f5ff8e0884f7fa500
 2021-10-11 16:24:37 +00:00
Anton Hansson
776a2bcb7e Merge "Update reference to merged services txt" am: 6fcddda43c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850001

Change-Id: I4ec095dfc7fb6b8e698c9d5eeed4c1065500c7fc
 2021-10-11 16:10:56 +00:00
Anton Hansson
6fcddda43c Merge "Update reference to merged services txt" 2021-10-11 15:57:02 +00:00
Colin Cross
99c3ed94b8 Allow defaults in java_genrule modules 
Call InitDefaultableModule in java_genrule factories to allow
the defaults property to be used.

Bug: 202547639
Test: m checkbuild
Change-Id: I3a5960304af3e9babb30d036d63016087000d773
 2021-10-08 17:52:32 -07:00
Liz Kammer
bb88d20495 Merge "bp2build; Update handling of linker flags" am: 2649c7913a am: e6450855c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846573

Change-Id: I1d11569fd28ad931cca400051d21a2f4fd825c0e
 2021-10-08 20:39:32 +00:00
Liz Kammer
e6450855c6 Merge "bp2build; Update handling of linker flags" am: 2649c7913a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846573

Change-Id: I9b462049bd56772ef83c9e2561f3ca8f3193baef
 2021-10-08 20:26:13 +00:00
Liz Kammer
2649c7913a Merge "bp2build; Update handling of linker flags" 2021-10-08 20:09:32 +00:00
Trevor Radcliffe
180beb174a Merge "Add support for USES_LIBRARIES to androidmk" am: c170e39a6b am: e0b5c20025 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846993

Change-Id: I43c3036f6c24f220267d699d381b7633a5478e4a
 2021-10-08 19:49:12 +00:00
Trevor Radcliffe
e0b5c20025 Merge "Add support for USES_LIBRARIES to androidmk" am: c170e39a6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846993

Change-Id: I1d8ca98660e397b4ca26082a9835e1bf5ad3fcee
 2021-10-08 19:29:10 +00:00
Trevor Radcliffe
c170e39a6b Merge "Add support for USES_LIBRARIES to androidmk" 2021-10-08 19:12:21 +00:00
Liz Kammer
fc1726a6f4 Merge "Restrict mixed build cquery to deps of depth 2." am: 8cdd6f007d am: 1f93d920c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849693

Change-Id: I3c1bdc442c69f6cf70949fcfc709d0c63ef0a788
 2021-10-08 17:41:05 +00:00
Liz Kammer
1f93d920c2 Merge "Restrict mixed build cquery to deps of depth 2." am: 8cdd6f007d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849693

Change-Id: I55f2bd60b00ec40d9bb4564c20de147b44466a21
 2021-10-08 17:23:50 +00:00
Liz Kammer
8cdd6f007d Merge "Restrict mixed build cquery to deps of depth 2." 2021-10-08 17:04:02 +00:00
Jingwen Chen
ffa51d929e Add bp2build support for cpp_std. am: 97b8531492 am: aff7f12f5a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850354

Change-Id: I958618bd81eeae0fae40999ad9fa60bab429e431
 2021-10-08 16:44:46 +00:00
Jingwen Chen
aff7f12f5a Add bp2build support for cpp_std. am: 97b8531492 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1850354

Change-Id: I159b9e957075b595318d22423f2d6f6e520a3d03
 2021-10-08 16:27:20 +00:00
Anton Hansson
f2dffd9c04 Update reference to merged services txt 
The module is changing name. Update the reference.

Bug: 169103987
Test: m
Change-Id: I1e3f05b6d9c0262adcde6881ea79df9338bb363a
 2021-10-08 16:15:10 +01:00
Jingwen Chen
97b8531492 Add bp2build support for cpp_std. 
This converts cpp_std and gnu_extensions into a -std copt, if cpp_std is
specified or gnu_extensions is false if cpp_std is not specified.

I chose to go with this copts approach because the tradeoff is a much
simpler setting than adding a new attr(s) everywhere that uses features
to set the flag.

This approach limits the number of user-configurable knobs (since users
would then be able to set std in _both_ copts and the new attr). But it
does rely on the user copt overriding the toolchain's default gnu++17
version, which can mean a `-std` flag showing up twice in the action.

Fixes: b/202462232
Test: b build //system/libziparchive:libziparchive
Change-Id: I81dad029059461739b91f318d662e089edb46b84
 2021-10-08 11:16:20 +00:00
Xin Li
1ba563eb3c [automerger skipped] Merge "Merge Android 12" am: 800112b97f -s ours am: 8e22b59b21 -s ours 
am skip reason: Merged-In Ia86b363c2556ad4999f124cbb9bec21cf0ad58ff with SHA-1 b5baa65c8e is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1847393

Change-Id: I42a4a5f0c452d9e1490a7ee68663daa9b5774cec
 2021-10-08 01:39:06 +00:00
Xin Li
8e22b59b21 [automerger skipped] Merge "Merge Android 12" am: 800112b97f -s ours 
am skip reason: Merged-In Ia86b363c2556ad4999f124cbb9bec21cf0ad58ff with SHA-1 b5baa65c8e is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1847393

Change-Id: I70e5da09f84bee2af473a72e316f8be037f1f3e8
 2021-10-08 01:19:41 +00:00
Xin Li
800112b97f Merge "Merge Android 12" 2021-10-07 23:50:21 +00:00
Jingwen Chen
d68ad80f07 Add support for nocrt by translating it to link_crt in bp2build. am: 6ada589f6e am: 6de8f75712 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830053

Change-Id: I4f73adf4c9077f936c519d30c0a960935e200b45
 2021-10-07 20:11:00 +00:00
Jingwen Chen
ab55d27fc9 Stop relying on target.kind in mixed builds. am: 8f22274297 am: ad5acd94de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849359

Change-Id: Ieaa9dee926d27e1133c725dabc6fdc451b389cc9
 2021-10-07 20:10:57 +00:00
Liz Kammer
0eae52e0de bp2build; Update handling of linker flags 
Test: build/bazel/ci/bp2build.sh
Bug: 197920036
Change-Id: I6e3100574fa0e40bcd8cf0e6af0efd3310aa41bf
 2021-10-07 16:07:40 -04:00
Jingwen Chen
6de8f75712 Add support for nocrt by translating it to link_crt in bp2build. am: 6ada589f6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830053

Change-Id: I2fbe236b2a81eb5f223ab566369b8dcfa7b04bca
 2021-10-07 19:49:37 +00:00
Jingwen Chen
ad5acd94de Stop relying on target.kind in mixed builds. am: 8f22274297 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849359

Change-Id: Iabf3aaea4cec22e1bc46dc8677bed5e6a57e0a20
 2021-10-07 19:49:33 +00:00