Commit Graph

82011 Commits

Author SHA1 Message Date
Inseob Kim
54f325aef3 Merge "Migrate buildinfo.sh script into Soong" into main am: 2f42ae62ea am: 075e8c7593
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3004875

Change-Id: I50b511322fb616fcae3d4963f6a09749ce15bf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 16:29:19 +00:00
Treehugger Robot
775145a4df Merge "Disable "__builtin_func" when converting mk to bp" into main am: f7e7776079 am: 50e87bea3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003793

Change-Id: I31589ac0805c4aa2142d3666a7ffb6517e047f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 16:29:09 +00:00
Kiyoung Kim
d126aeeaf7 Merge "Update linker.config.pb based on package dependency" into main am: 078188774f am: 89e11e4435
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3009718

Change-Id: I6057d3e03635f70bd16a06b838ebc3eb8d0e76ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 16:28:55 +00:00
Inseob Kim
075e8c7593 Merge "Migrate buildinfo.sh script into Soong" into main am: 2f42ae62ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3004875

Change-Id: Ib03603fa940a53f4a55d110cd934bb444891d68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 08:25:07 +00:00
Inseob Kim
2f42ae62ea Merge "Migrate buildinfo.sh script into Soong" into main 2024-03-26 08:06:06 +00:00
Inseob Kim
5baf2cbcb6 Migrate buildinfo.sh script into Soong
To build system.img in Soong, we need all artifacts including
build.prop. This fully migrates buildinfo.prop file into Soong as a
first step to build build.prop on Soong.

Bug: 322090587
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
Change-Id: Icaa7e1fdab2a8c169ac00949d3aaf6c8212a1872
2024-03-26 05:55:49 +00:00
Treehugger Robot
50e87bea3b Merge "Disable "__builtin_func" when converting mk to bp" into main am: f7e7776079
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003793

Change-Id: Id2ac8aef76f1eca564b5834addeabb89e040377c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 02:48:25 +00:00
Treehugger Robot
f7e7776079 Merge "Disable "__builtin_func" when converting mk to bp" into main 2024-03-26 02:30:35 +00:00
Kiyoung Kim
89e11e4435 Merge "Update linker.config.pb based on package dependency" into main am: 078188774f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3009718

Change-Id: Idaca7a023867b3790bc10353c40599119cb8a8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:59:00 +00:00
Colin Cross
ba7ed90fc2 Merge changes from topic "revert-3010297-revert-3008874-OJOKRLYEZJ-YRWACROLKC" into main am: 9dcc3676a9 am: e02a3cff20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008805

Change-Id: I38ca136c9da7b23ce4a171b8e79cfb96c333c2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:53:53 +00:00
Colin Cross
7f976cecd0 Revert "Revert "Support transitive dependencies through android_..." am: 9055e21914 am: 9f67cd1ba9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008804

Change-Id: I88a45eb7a54a44e694b9b84930d79284a1dfc461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:53:48 +00:00
Kiyoung Kim
078188774f Merge "Update linker.config.pb based on package dependency" into main 2024-03-26 00:42:17 +00:00
Colin Cross
e02a3cff20 Merge changes from topic "revert-3010297-revert-3008874-OJOKRLYEZJ-YRWACROLKC" into main am: 9dcc3676a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008805

Change-Id: I917605dc25c27ad6c35e4bf6ff70578484990884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:26:23 +00:00
Colin Cross
9f67cd1ba9 Revert "Revert "Support transitive dependencies through android_..." am: 9055e21914
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008804

Change-Id: I094ecac4635f4b869627f14ca2d24eaf4dedce63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:26:18 +00:00
Colin Cross
9dcc3676a9 Merge changes from topic "revert-3010297-revert-3008874-OJOKRLYEZJ-YRWACROLKC" into main
* changes:
  Revert^2 "Support static_libs for java_import modules"
  Revert "Revert "Support transitive dependencies through android_..."
2024-03-26 00:11:02 +00:00
Yi Kong
866cb16536 Merge "Remove ThinLTO workaround for VNDK" into main am: 949157d582 am: b036a6ad92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2809713

Change-Id: I9057531fc0985282ac9d88e6747b88207aae3d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 07:54:27 +00:00
Yi Kong
b036a6ad92 Merge "Remove ThinLTO workaround for VNDK" into main am: 949157d582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2809713

Change-Id: I4d3f6993d6af5d6dc03d28681b7e6fac2079309e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 07:31:06 +00:00
Yi Kong
949157d582 Merge "Remove ThinLTO workaround for VNDK" into main 2024-03-25 07:14:29 +00:00
Treehugger Robot
6d08d4eea6 Merge "Add required, host_required, and target_required as dependencies" into main am: e58af3da5a am: 6116be9092
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000612

Change-Id: Id534cb12d9786af0d99fd30f0389e02725309803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 04:48:32 +00:00
Treehugger Robot
6116be9092 Merge "Add required, host_required, and target_required as dependencies" into main am: e58af3da5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000612

Change-Id: I931b74d313815878a7e407d21c72f93102168e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 04:31:10 +00:00
Treehugger Robot
e58af3da5a Merge "Add required, host_required, and target_required as dependencies" into main 2024-03-25 04:10:50 +00:00
Kiyoung Kim
ee599d6694 Update linker.config.pb based on package dependency
Current linker.config.pb from the package is generated with
auto-detected provide libs, but this misses require libs which can be
detected from module dependency. This change adds extra require libs to
linker.config.pb generated from system image so it can link with modules
outside of system image.

Bug: 324995772
Test: Link succeeded from Cuttlefish with soong defined system image
Change-Id: I8563ec9ddce2a1648cc9ee55704c9483e137b710
2024-03-25 11:20:11 +09:00
Colin Cross
9055e21914 Revert "Revert "Support transitive dependencies through android_..."
Revert submission 3010297-revert-3008874-OJOKRLYEZJ

Reverted changes: /q/submissionid:3010297-revert-3008874-OJOKRLYEZJ

Change-Id: I885a449ddc284052f9d4ec0c030d5fc61247b522
2024-03-23 04:43:41 +00:00
Colin Cross
dad2a361ef Revert^2 "Support static_libs for java_import modules"
c6c9c7354b

Change-Id: Id011aca133d7bb45023a63c0f53d84a4d694cc2f
2024-03-23 04:43:41 +00:00
Jiyong Park
466c95d36d Merge "Ensure that genrule's host tool deps are for host" into main am: 74ff1f80bc am: 8e10052a33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000611

Change-Id: Ie9ff659a4f58560964af3db4472bf73edd1ae781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-23 00:06:22 +00:00
Colin Cross
252571c940 Merge changes from topic "revert-3008874-OJOKRLYEZJ" into main am: 567b9d707b am: 487e73abc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3010298

Change-Id: Ifba850f3b544766b5d84406242d4b9798f560715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-23 00:05:20 +00:00
Colin Cross
a611b3dec0 Revert "Support static_libs for java_import modules" am: c6c9c7354b am: 3fd7beb859
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3010297

Change-Id: Ib1af3605b433db0a606f1f7986e8c8e80f3661e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-23 00:05:05 +00:00
Jiyong Park
8e10052a33 Merge "Ensure that genrule's host tool deps are for host" into main am: 74ff1f80bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000611

Change-Id: I72e402e56ab8182131b613b9dab7bc42712e33bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 23:53:33 +00:00
Jiyong Park
74ff1f80bc Merge "Ensure that genrule's host tool deps are for host" into main 2024-03-22 23:33:48 +00:00
Elliott Hughes
bc8ba7b31e Merge "We have a prebuilt getopt now." into main am: 34c93d8e15 am: 413bce5644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982535

Change-Id: I44c301615e4c167318ee30bc212fbca50006aeb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 22:23:25 +00:00
Colin Cross
dcc08abb2e Merge changes from topic "no_more_nodeps" into main am: 77be51bcab am: 05856e5b4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008874

Change-Id: I08cab90a5a3da918c8a2e7e66f3a2a9234443333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 22:22:58 +00:00
Colin Cross
06b6e250f4 Support transitive dependencies through android_libary_import modules am: 8179496764 am: cf1ec413be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2993110

Change-Id: I5043d181d10ec876fb02483b0764d7b1c8d5d76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 22:22:53 +00:00
Colin Cross
487e73abc5 Merge changes from topic "revert-3008874-OJOKRLYEZJ" into main am: 567b9d707b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3010298

Change-Id: I3dbc147cd2ff096ac6c701016060438e81db77bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 18:46:06 +00:00
Colin Cross
3fd7beb859 Revert "Support static_libs for java_import modules" am: c6c9c7354b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3010297

Change-Id: If74d1c2906d74e5dd1c95189c04197d9bc51912e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 18:46:01 +00:00
Colin Cross
567b9d707b Merge changes from topic "revert-3008874-OJOKRLYEZJ" into main
* changes:
  Revert "Support transitive dependencies through android_libary_i..."
  Revert "Support static_libs for java_import modules"
2024-03-22 18:25:30 +00:00
Colin Cross
c6c9c7354b Revert "Support static_libs for java_import modules"
Revert submission 3008874

Reason for revert: b/330903911
Reverted changes: /q/submissionid:3008874

Change-Id: I34cca9d021d9c806e28bb6a6a6da78efd61cde27
2024-03-22 18:17:00 +00:00
Colin Cross
44841aada3 Revert "Support transitive dependencies through android_libary_i..."
Revert submission 3008874

Reason for revert: b/330903911
Reverted changes: /q/submissionid:3008874

Change-Id: Ie056a7f90803ab2d8e39e07eddf6c9c68e41ff3d
2024-03-22 18:16:57 +00:00
Elliott Hughes
413bce5644 Merge "We have a prebuilt getopt now." into main am: 34c93d8e15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982535

Change-Id: Id06335d70357c253c5d27a2099e06c6379257809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:48:33 +00:00
Elliott Hughes
34c93d8e15 Merge "We have a prebuilt getopt now." into main 2024-03-22 17:33:47 +00:00
Colin Cross
05856e5b4f Merge changes from topic "no_more_nodeps" into main am: 77be51bcab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008874

Change-Id: I61e0eb36c0faaf26fdb699c24a19ed4de4ebf372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:19:27 +00:00
Colin Cross
cf1ec413be Support transitive dependencies through android_libary_import modules am: 8179496764
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2993110

Change-Id: I87cba26c2c9e33893aa8580453ef70d3f6dae1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 17:19:23 +00:00
Colin Cross
77be51bcab Merge changes from topic "no_more_nodeps" into main
* changes:
  Support static_libs for java_import modules
  Support transitive dependencies through android_libary_import modules
2024-03-22 16:55:47 +00:00
Elliott Hughes
4e0ccf4f59 We have a prebuilt getopt now.
getopt doesn't appear to be used any more, but we've added the prebuilt anyway. Update soong's $PATH allowlist correspondingly.

Change-Id: Id416703697f464f4a3b73771611e087d2ec265d1
2024-03-22 16:08:21 +00:00
Ivan Lozano
c3641ae351 Merge "rust: Add export_include_dirs property to rust_ffi" into main am: aad0b20d2b am: 64a2c84550
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005613

Change-Id: I7e965faa8e7752e3f2f0ccfc524b27f13610f9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 14:09:21 +00:00
Ivan Lozano
64a2c84550 Merge "rust: Add export_include_dirs property to rust_ffi" into main am: aad0b20d2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005613

Change-Id: I4d1991998af6cc83825767d6710ad3600a287166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 13:21:30 +00:00
Ivan Lozano
aad0b20d2b Merge "rust: Add export_include_dirs property to rust_ffi" into main 2024-03-22 12:59:06 +00:00
Treehugger Robot
94d058bdb4 Merge "Revert "Enable full LTO optimization by default"" into main am: bfa7f261d1 am: 2c447b1604
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002586

Change-Id: Ic9cacc6bd6c18904276d12ed85e6b3e4642e8a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 09:51:34 +00:00
Treehugger Robot
2c447b1604 Merge "Revert "Enable full LTO optimization by default"" into main am: bfa7f261d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002586

Change-Id: I1acfd563630e21d259039cccffd9583a2a153711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 09:28:05 +00:00
Treehugger Robot
bfa7f261d1 Merge "Revert "Enable full LTO optimization by default"" into main 2024-03-22 09:01:23 +00:00
Ting-Hsin Chen
20467d0a29 [automerger skipped] Merge "Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"" into main am: 8d98a99ad7 am: 2afe61ecc0 -s ours
am skip reason: Merged-In Ibdd1e0d0d4f08f4f5251b9c4baa1aaf42e7df34f with SHA-1 4017d70d3b is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/build/soong/+/3007754

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

Change-Id: I3b48f896250440fff57c566191fa40864999ffbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 06:56:29 +00:00