Commit Graph

46175 Commits

Author SHA1 Message Date
Mohammad Islam
214a923f0d Merge "Add EROFS support for APEX build system" 2021-10-15 15:44:47 +00:00
Liz Kammer
f396b8c670 Merge "Update version_script to be handled as linkopt" am: 51da93381c am: ef24720686
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844461

Change-Id: Ia5770060db67affb7acbe398701a328c418bfc87
2021-10-15 14:56:10 +00:00
Liz Kammer
ef24720686 Merge "Update version_script to be handled as linkopt" am: 51da93381c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844461

Change-Id: I7740552854fc3056d94092dafd4b79fd0470571a
2021-10-15 14:40:00 +00:00
Liz Kammer
51da93381c Merge "Update version_script to be handled as linkopt" 2021-10-15 14:22:27 +00:00
Martin Stjernholm
ccf24516cf Merge "Make all the PrebuiltEtc modules defaultable." am: 1e78f58168 am: c651c1692b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856366

Change-Id: Iceacf91446c7deea787044cb0c48624351144d11
2021-10-15 14:17:06 +00:00
Martin Stjernholm
c651c1692b Merge "Make all the PrebuiltEtc modules defaultable." am: 1e78f58168
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856366

Change-Id: Ic0a8054ab1a3b0a542ac100520b5ca5d8f47e1b6
2021-10-15 13:59:52 +00:00
Martin Stjernholm
1e78f58168 Merge "Make all the PrebuiltEtc modules defaultable." 2021-10-15 13:44:59 +00:00
Jiakai Zhang
3853562adb Merge "Extract the logic of setting Uncompress_dex to a common place." am: ae9ba1c93a am: c5e71ecc55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853133

Change-Id: I2ccb36ca226268dc647cf9b22b8b8b1aaaf309d2
2021-10-15 03:55:54 +00:00
Jiakai Zhang
c5e71ecc55 Merge "Extract the logic of setting Uncompress_dex to a common place." am: ae9ba1c93a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853133

Change-Id: I8bea5a2979ae496acd9a9de5ec52c3175701f527
2021-10-15 03:44:51 +00:00
Jiakai Zhang
ae9ba1c93a Merge "Extract the logic of setting Uncompress_dex to a common place." 2021-10-15 03:30:47 +00:00
Treehugger Robot
57fbf57305 Merge "Add android_sdk_repo_host to build platform-tools&build-tools" am: adf2b3e68f am: e89cd9f2b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828170

Change-Id: If31d0eb0ffb816a08c15fbfea830bc5bb78727e2
2021-10-15 02:48:58 +00:00
Treehugger Robot
e89cd9f2b5 Merge "Add android_sdk_repo_host to build platform-tools&build-tools" am: adf2b3e68f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828170

Change-Id: I2e06ecdde08dc0f813a1775d4612671f7bcc44ab
2021-10-15 02:29:40 +00:00
Treehugger Robot
adf2b3e68f Merge "Add android_sdk_repo_host to build platform-tools&build-tools" 2021-10-15 02:04:45 +00:00
Ivan Lozano
39b0bf0326 rust: Package shared libraries with fuzzer zips
Rust fuzzers were not packaging up their CC shared dependencies.
This would lead to fuzzers using the shared libraries included on
system, which may not be sanitized, leading to incorrect behavior.

This refactors the relevant code from CC and calls it from the Rust
build logic.

Bug: 202282599
Test: output rust fuzzer zip file includes shared dependencies.
Change-Id: I92196eb0141733797a67eae24f8e9aedea94c3bc
2021-10-14 15:31:47 -04:00
Chris Parsons
d80b3c8218 Use hardlinks for Bazel's symlink actions
This prevents failures resulting from using `cp -d` on symlinks.

Test: USE_BAZEL_ANAYSIS=1 m adbd
Change-Id: Ic1756ffe407df81b0e99f99c50bee6af4ecf7796
2021-10-14 15:24:05 -04:00
Stephen Hines
a13cb2b3b0 Merge "Switch to clang-r433403b (13.0.3)" am: f7bc97ce7a am: 7996129541
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857593

Change-Id: I6d158b67b0fc9cbb66df3a9dc4dc8d1a2c0c9cd5
2021-10-14 19:17:23 +00:00
Stephen Hines
7996129541 Merge "Switch to clang-r433403b (13.0.3)" am: f7bc97ce7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857593

Change-Id: I503478cb6d41826e56bd3e4d075ba558c3c88b52
2021-10-14 18:58:49 +00:00
Stephen Hines
f7bc97ce7a Merge "Switch to clang-r433403b (13.0.3)" 2021-10-14 18:46:08 +00:00
Seth Moore
fdf99b1a08 Merge "Flag an error on empty rust module srcs" am: 6ec96b8102 am: 2e2fb66ecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: Ie077120f67aa8e01954bedf0534d2530618aa235
2021-10-14 16:07:16 +00:00
Seth Moore
2e2fb66ecc Merge "Flag an error on empty rust module srcs" am: 6ec96b8102
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: I1039d7b57ac4c63cf39779e9f38f5783f17f613d
2021-10-14 15:54:45 +00:00
Seth Moore
6ec96b8102 Merge "Flag an error on empty rust module srcs" 2021-10-14 15:25:17 +00:00
Seth Moore
3afac0b36f Flag an error on empty rust module srcs
It's an error if a rust module's srcs is empty. Prior to this change
the output was a panic that complains loudly about a slice error and
nothing else. This change doesn't stop the panic, but at least adds
a bit of context so devs who make a simple mistake can more easily
fix it.

Test: SOONG_GEN_RUST_PROJECT=1 m nothing
Change-Id: Id7d8465d533413c3000699661222a53a7c8678f3
2021-10-14 15:25:07 +00:00
Liz Kammer
74f79ad88f Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: Ibc486265c1e3f6d7002f8d45378e5f918960562e
2021-10-14 14:32:45 +00:00
Liz Kammer
183628579e Merge "Add missing directories to bp2build." am: 47a6c59819
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: Idfe2ae1de1b881d563cb96cc5e1ee306a11bda42
2021-10-14 14:20:45 +00:00
Liz Kammer
47a6c59819 Merge "Add missing directories to bp2build." 2021-10-14 14:03:33 +00:00
Yi Kong
2d2452c88e Add Global ThinLTO option (2nd try) am: 8ea56f9da9 am: 370a0be4b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I0ff76fd8fbae1193b78071f32ccaa887d8d0beb7
2021-10-14 12:06:54 +00:00
Yi Kong
370a0be4b8 Add Global ThinLTO option (2nd try) am: 8ea56f9da9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I09ed730f75ae10daf8293ede971b35342d6f61d2
2021-10-14 11:52:00 +00:00
Yi Kong
8ea56f9da9 Add Global ThinLTO option (2nd try)
Instead of making everything into ThinLTO variant by default (it works
but many Soong tests don't like this, and got bit rot due to lack of
active builder for this configuration), let the default option be
ThinLTO and no LTO be a special variant.

Test: m GLOBAL_THINLTO=true
Test: m
Bug: 195134194
Change-Id: I2fd98061ba55eba1fdfdd056fb2f8c2051fd2553
2021-10-14 17:34:13 +08:00
Stephen Hines
b7b0ae12be Switch to clang-r433403b (13.0.3)
Bug: http://b/202099787
Test: m
Change-Id: Id923948c56b0308842c94846edd6528fd26dbf72
2021-10-14 01:21:21 -07:00
Jiyong Park
7330b2652e Merge "Remove use_apex_name_macro" am: ddf4ebae19 am: c05ccb3724
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: I7eb0ed8bc578db25d4c38735a03aa241eb3c8694
2021-10-14 03:02:00 +00:00
Jiyong Park
c05ccb3724 Merge "Remove use_apex_name_macro" am: ddf4ebae19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: Ic55eb66ee9414e9a883beba942d3b0616b564139
2021-10-14 02:47:11 +00:00
Jiyong Park
ddf4ebae19 Merge "Remove use_apex_name_macro" 2021-10-14 02:32:43 +00:00
Jiyong Park
91f1b42226 Remove use_apex_name_macro
The property is no longer used.

Bug: 161926892
Test: m
Change-Id: I98948152d6d09bde2eeba4875c7ca01531a24930
2021-10-14 08:57:59 +09:00
Martin Stjernholm
dc6525e553 Make all the PrebuiltEtc modules defaultable.
Test: m nothing
Change-Id: I69d73ebf2f0761787c6e71241344a43d3b9d49f8
2021-10-14 00:55:53 +01:00
Trevor Radcliffe
1b2e2ff8d8 Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff am: 6e4211d099
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I35e7b80bd1ce33b992ed088c9a5eb14b826beb87
2021-10-13 22:43:21 +00:00
Trevor Radcliffe
6e4211d099 Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I6966aad04ddd80cd2441ebe239c246bee84ea627
2021-10-13 22:22:56 +00:00
Trevor Radcliffe
8c1ae8f2ff Merge "Ignore obsolete lines when converting makefiles" 2021-10-13 22:07:50 +00:00
Liz Kammer
2fc348986c Add missing directories to bp2build.
Added directories with deps of adbd that were not converted and added
them to be converted via bp2build.

Test: bp2build.sh
Test: mixed_droid.sh
Change-Id: Iacb634b23e1fdc2767a0923882b71f482ebca53d
2021-10-13 17:07:41 -04:00
Lev Rumyantsev
2b9c2fce9a Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: Ie00b8f40b8a48d66022ee13d18f8b50990eef6a0
2021-10-13 20:20:09 +00:00
Lev Rumyantsev
524b468a25 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: Id456023beeb4d6e930e60241512a0eeab31c4162
2021-10-13 20:06:42 +00:00
Lev Rumyantsev
1eda2bd946 Merge "Support 64-bit arm_on_x86_64" 2021-10-13 19:42:49 +00:00
Treehugger Robot
3796dae3e1 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I0508155f97fedaa943d0892a10f06fbcff14cc53
2021-10-13 18:01:54 +00:00
Treehugger Robot
1f211a9b88 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I015e6afd10cd5359b8c03596cde41a665f46165a
2021-10-13 17:46:52 +00:00
Treehugger Robot
3bc7a1ba47 Merge "bp2build: Add special arch-variant targets." 2021-10-13 17:29:36 +00:00
Trevor Radcliffe
93295f27e4 Ignore obsolete lines when converting makefiles
Specifically this skips cases where LOCAL_MODULE_PATH
is TARGET_OUT_OPTIONAL_EXECUTABLES or TARGET_OUT_DATA_APPS.

Test: Added tests
Test: Treehugger
Change-Id: Ib64f22fc3936703c665d07dbb25d8ebf3b9f56c5
2021-10-13 17:16:18 +00:00
Lev Rumyantsev
34581212a4 Support 64-bit arm_on_x86_64
hasArmAndroidArch only checked for 32-bit arm target and thus didn't
work properly on 64-bit only systems.

Test: CtsRsCppTestCases 64-bit only arm on x86
Bug: 194800662
Change-Id: I87332d793dcdd4859766c9067b9fd53f9e4c2516
2021-10-13 09:55:10 -07:00
Jingwen Chen
fbe7230f52 Merge "Revert "Fix test to use --experimental_platform_in_output_dir."" am: 7b568c1cea am: 2ddc1eb1fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856337

Change-Id: I53b7788a0a3da48fe47a8e8240f8f41bab0f74d6
2021-10-13 16:01:58 +00:00
Jingwen Chen
2ddc1eb1fa Merge "Revert "Fix test to use --experimental_platform_in_output_dir."" am: 7b568c1cea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856337

Change-Id: If085d93a11035ba47310bddafd94e4c19f83ff19
2021-10-13 15:46:38 +00:00
Jingwen Chen
7b568c1cea Merge "Revert "Fix test to use --experimental_platform_in_output_dir."" 2021-10-13 15:34:12 +00:00
Paul Duffin
a242a29f0e Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am: 13dd220448 am: 964d2d7a51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853520

Change-Id: Iecb4a24bd11de293eac749ee33caca7a1aa69857
2021-10-13 15:21:21 +00:00