StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,175 Commits 1 Branch 0 Tags
f3d901b71d0f768e30233d74feca0332308d917d
Commit Graph

46175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
964d2d7a51 Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am: 13dd220448 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853520

Change-Id: I5b1dd835c33e1c4efe4ed2f142afcc68aa0aa1d7
 2021-10-13 15:06:57 +00:00
Paul Duffin
13dd220448 Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" 2021-10-13 14:53:17 +00:00
Jingwen Chen
3c5083c058 Revert "Fix test to use --experimental_platform_in_output_dir." 
Revert submission 1854375-update-bazel-daecf427ec0bf0e963c324783062c4f5b61ff679

Reason for revert: introduces 503d56eda2, which conflicts with our current cc_binary->cc_shared_library work
Reverted Changes:
I40a511195:Fix test to use --experimental_platform_in_output_...
I05c2c11f3:Update Bazel to https://github.com/bazelbuild/baze...
Ie772d1665:Set --experimental_platform_in_output_dir.
Id66674d72:Update Bazel to https://github.com/bazelbuild/baze...

Change-Id: I0e5a7548feb13c2f3b4deae1921542b15d23a283
 2021-10-13 14:25:41 +00:00
Liz Kammer
f703490fc8 Merge "Do not sort after subtraction." am: 06f00c33a7 am: 36d9558c4f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853858

Change-Id: I9aa6f661fd892022749688b19b8f3e7d4368db7a
 2021-10-13 13:02:36 +00:00
Liz Kammer
fdd72e6351 bp2build: Add special arch-variant targets. 
Soong supports additional arch-variant targets based on arch/os aside
from strictly arch/os names. Handle the unconverted cases based solely
on arch/os.

Test: build/bazel/ci/bp2build.sh
Change-Id: I8dc987b1aa4a4ea646dd5b03a94b84297ba6113a
 2021-10-13 09:01:56 -04:00
Liz Kammer
36d9558c4f Merge "Do not sort after subtraction." am: 06f00c33a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853858

Change-Id: Ia3269f2661633b9236aafbc11b529cf5bbaed367
 2021-10-13 12:46:27 +00:00
Liz Kammer
d2871189b1 Update version_script to be handled as linkopt 
This allows us to handle this consistently between cc_binary and
cc_library* types.

Test: build/bazel/ci/bp2build.sh
Change-Id: I996f42bbe591215217c3d561662e775925b871ff
 2021-10-13 08:36:58 -04:00
Liz Kammer
06f00c33a7 Merge "Do not sort after subtraction." 2021-10-13 12:27:48 +00:00
Lukacs T. Berki
9699c52ca3 Update debugging instructions. 
The ones here were obsolete.

Test: None (only documentation changes)
Change-Id: Idf5d1490e0f9d55f2078e6ba7396b80da73be369
 2021-10-13 11:04:52 +02:00
Dan Willemsen
9fe1410213 Add android_sdk_repo_host to build platform-tools&build-tools 
The Android SDK has been built with Make up until now, monolithically,
then split up into several sdk-repo zip files for different purposes.
The Mac and Windows SDKs really only need to contain the platform-tools
and build-tools pieces, but due to this monolithic sdk zip, we had to
build the whole SDK first.

This adds an `android_sdk_repo_host` module that can build these
platform-tools and build-tools zips.

Bug: 187222815
Change-Id: I55809e1d7447dd65e22461f921b2b8abb6d5f822
 2021-10-13 01:25:02 -07:00
Jingwen Chen
7c07296273 Merge "Fix test to use --experimental_platform_in_output_dir." am: 3e4d25552b am: 8169a3680f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854375

Change-Id: Ic0d53c9d7b473a17433169ba758b7c0926f37ad4
 2021-10-13 07:37:34 +00:00
Jingwen Chen
8169a3680f Merge "Fix test to use --experimental_platform_in_output_dir." am: 3e4d25552b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854375

Change-Id: I03af54b556e789939c12358d2c0484697d95e99a
 2021-10-13 07:21:58 +00:00
Jingwen Chen
3e4d25552b Merge "Fix test to use --experimental_platform_in_output_dir." 2021-10-13 07:04:05 +00:00
Pirama Arumuga Nainar
6189e257ba Merge "[get_clang_version] Make the version regex permissive" am: 1b6a962be3 am: 5f47034133 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846794

Change-Id: I789925d7623110c73fa3f3df9866b8c862b6a35c
 2021-10-13 06:16:16 +00:00
Pirama Arumuga Nainar
5f47034133 Merge "[get_clang_version] Make the version regex permissive" am: 1b6a962be3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846794

Change-Id: I1160b69d52a337f99e458270e4cc3a25051417b4
 2021-10-13 06:01:56 +00:00
Pirama Arumuga Nainar
1b6a962be3 Merge "[get_clang_version] Make the version regex permissive" 2021-10-13 05:47:35 +00:00
Yi Kong
904191ecea Merge "Re-enable unused-command-line-argument warning" am: a9e56f062d am: 0a7e9a5283 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1799592

Change-Id: I02c790e9029c05c7dca762547f2f46910f77ebe8
 2021-10-13 04:48:48 +00:00
Yi Kong
0a7e9a5283 Merge "Re-enable unused-command-line-argument warning" am: a9e56f062d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1799592

Change-Id: Ie9faf37db943c22fe752190017a9b053deff0cb3
 2021-10-13 04:29:20 +00:00
Yi Kong
a9e56f062d Merge "Re-enable unused-command-line-argument warning" 2021-10-13 04:12:12 +00:00
Yi Kong
62e75f507d Re-enable unused-command-line-argument warning 
Turn on the warning by default, unless USE_CCACHE is set.

Test: presubmit
Bug: 197177755
Change-Id: I01e2b0f1be3f4bd3a8d78bb4ab053b4db227596d
 2021-10-13 04:11:56 +00:00
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
c6ef451e0e Fix test to use --experimental_platform_in_output_dir. 
Bug: 197925723
Test: CI
Change-Id: I40a511195ff7cc5fc336d3671bcdccd2364ca432
 2021-10-13 02:25:19 +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
9bad9d645e Do not sort after subtraction. 
This allows labels/strings to remain in their original order.

Test: go test bazel tests
Change-Id: I69f575df9e4a358fee4392ae48edf4550e463efb
 2021-10-12 13:36:27 -04: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
Paul Duffin
2579631bd1 Stop prebuilt_apex/apex_set exporting invalid jars to Make 
A prebuilt_apex/apex_set module can make a dex implementation jar
available for use by Make targets but it does not have access to a real
classes implementation jar; the jar in the corresponding sdk is just an
empty file. Exporting that invalid file to Make means that the phony
target created for the module depends on an invalid classes jar which
causes the build to fail.

This change removes the logic that make classes and header jars
available to Make so that building the phony target no longer fails.

Bug: 202521005
Test: m TARGET_PRODUCT=armv8 TARGET_PRODUCT_VARIANT=eng TARGET_BUILD_UNBUNDLED=true SOONG_ALLOW_MISSING_DEPENDENCIES=true core-icu4j
      - above was performed in master-art.
Change-Id: If667b36b988e2d331acd85f60f3369778838d034
 2021-10-11 17:53:54 +01: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