Commit Graph

76529 Commits

Author SHA1 Message Date
Treehugger Robot
c9a581f5dc Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb am: 1edc01ae07 am: ed965f2258
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I2c8f767315f91cf3039b5a963f452ad62bde615b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:10:56 +00:00
Treehugger Robot
8225cbfc71 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734 am: 72ea2dc659 am: 5545f6aecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I24c7944653e30b8da3307fb096f74078f59453d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:07:04 +00:00
Treehugger Robot
ed965f2258 Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb am: 1edc01ae07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I3a333961706ffad831dbe1ec3c07154af7a391f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:09:18 +00:00
Treehugger Robot
5545f6aecc Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734 am: 72ea2dc659
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I162fa2aeda2f30ea6d104daf2b7a91cdb3d498e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:05:30 +00:00
Treehugger Robot
1edc01ae07 Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I408bc2c939902636c58c7dc6ad131f3644e32370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:27:34 +00:00
Treehugger Robot
72ea2dc659 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I6a494785326820115fb40e1bd8ed31bad2e4fe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:24:48 +00:00
Treehugger Robot
fcc7fcf1eb Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I44642943e4154ac2d13cdfbdcda4a6bc5035838a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:33:46 +00:00
Treehugger Robot
69be5dd734 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I40e4eb44041fb5e9ff920e8dc68d16a9d7a5a7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:33:37 +00:00
Treehugger Robot
16542620eb Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I7c94b0fb24d2c4a272308a932f1261638d94a546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 18:56:02 +00:00
Treehugger Robot
48b6649189 Merge "Sort always convert by type list" into main am: 35f1ae0721
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: Ib624dd4be4dd06aae0f6ab4338113089d3b4fb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 18:55:13 +00:00
Treehugger Robot
35bc07cb2a Merge "don't compress JNI libs extracted from aar_import" into main 2023-09-18 18:20:52 +00:00
Treehugger Robot
35f1ae0721 Merge "Sort always convert by type list" into main 2023-09-18 18:03:58 +00:00
Liz Kammer
4fc71fff30 Sort always convert by type list
Test: CI
Change-Id: Icdf1f4e8132d959b494e2570854ee06973a816b0
2023-09-18 09:11:18 -04:00
Treehugger Robot
43e6b35185 Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a am: 46f9650c89 am: 094228c3ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: Idba7f72d8a39256fa448c8ce0b0bb1936f8c4971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 08:37:47 +00:00
Treehugger Robot
094228c3ab Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a am: 46f9650c89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: I9ae9abcffc32c637d0bebce4e5221d095030c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 07:35:17 +00:00
Treehugger Robot
46f9650c89 Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: Ie71a7cc2132b24ec461216875c2798ba4536077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 06:54:02 +00:00
Treehugger Robot
93a212402a Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: I2520aae85a702fb82ee841869d1da77471967291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 06:01:15 +00:00
Treehugger Robot
2aa5b5dec2 Merge "Handle bad rename" into main am: faa7c7c102
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: I7b69be23892d062d8cfacf03d8fa66a45809da73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 05:01:58 +00:00
Treehugger Robot
faa7c7c102 Merge "Handle bad rename" into main 2023-09-16 03:52:51 +00:00
Liz Kammer
00543dc61c Handle bad rename
Cleanspec wasn't working, so let's handle it in Soong

Test: create an invalid file, run m nothing, verify it is removed
Change-Id: I55d3c9344541b8e504887225a660044e14204427
2023-09-15 21:22:55 -04:00
Treehugger Robot
7701b8f7cd Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586 am: d4f118cb2f am: 6d933e23d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: Ic9e00c8cc74b655e625c1ea9de9280fbfb150b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:36:05 +00:00
Zi Wang
0e1590cff7 Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c am: 8f1e3e697c am: 448d6bdcbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I3eb2da804ebfc6ef63777b55d2b2af02e1175711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:35:54 +00:00
Edward Liaw
02c3332d98 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8 am: c7ed522e1a am: b571a05c69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I88ee27714de65ec53610bc389c068da5b777b5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:35:43 +00:00
Treehugger Robot
c4b7cc7f33 [automerger skipped] Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e am: 66863f6f3b am: 53c84e4e92 -s ours
am skip reason: Merged-In I389d9535ea176991a1faa9beb46352b93363acd2 with SHA-1 71a5cd15c6 is already in history

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

Change-Id: I10b35983455ef960cc5a0bae2027db77de38f6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:33:41 +00:00
Treehugger Robot
6d933e23d2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586 am: d4f118cb2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I0623653b49099d1511216e77cc4492b716c4bb57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:33:31 +00:00
Zi Wang
448d6bdcbe Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c am: 8f1e3e697c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: Ibe1f64a299395e374c17ad33faf17863d39d31c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:32:58 +00:00
Edward Liaw
b571a05c69 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8 am: c7ed522e1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I3cd850649ebcb2d8409d3daaf5deb77784dbee7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:32:13 +00:00
Treehugger Robot
53c84e4e92 Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e am: 66863f6f3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I5b953db566570e74bcffd78a4aee71c935009f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:30:00 +00:00
Treehugger Robot
d4f118cb2f Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: Ie6eb329eaa3f7304088778548346bfa32d7e0d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:49 +00:00
Zi Wang
8f1e3e697c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I8b85af966cb9126b45ed39c97776ed65b0d71409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:07 +00:00
Edward Liaw
c7ed522e1a Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I4482ccc26b10e716a659128ae0f4b8cd02e952b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:52:57 +00:00
Treehugger Robot
66863f6f3b Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ia5c1d2ebbda7d73910dfd5aaf5c5673d943c02d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:50:27 +00:00
Treehugger Robot
62c3214586 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I7a00b33722f51121531b30b3981846f1b32e6c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:58:04 +00:00
Zi Wang
7ccd48617c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I2bf4f8a67332da3d970ed7e24fc612658c4523ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:54 +00:00
Edward Liaw
5e95201ca8 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ic53e1c7965ce3df6c2394847873ae7a6a146251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:31 +00:00
Treehugger Robot
b3130adf9e Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I5f1466bc66a2108e15efcd36789311b20fbdc198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:55:48 +00:00
Treehugger Robot
030bf35e07 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c am: 12fb0d47d5 am: 8dcda002d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: I5fa739fffbdb2d36129d9ed10d6de339e7669dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:53:41 +00:00
Kousik Kumar
69e4077ed7 Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4 am: e252ef195e am: 736cf4ed7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I00542a954a892f67ed1177051e93cf3459bf551b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:50:57 +00:00
Treehugger Robot
3a01b22df2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I6419fd0cb9cb50e9f2d993df8d77456458a3c5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Treehugger Robot
9f7028852c Merge "Allowlist ndk STL dependencies" into main 2023-09-15 21:23:49 +00:00
Zi Wang
cccefd7433 Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I095b48f0bbe31fdc65df43a81693b7dfb7c60da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:17 +00:00
Edward Liaw
05f4b4dd0f Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ia2e034fae5fb4911c613580c87a9d2f4a1600140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:00 +00:00
Treehugger Robot
b5a1dfb557 Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ibd550eab55f703303f98fa6233e5e12387d8f26d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:56:21 +00:00
Treehugger Robot
8dcda002d0 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c am: 12fb0d47d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ib370e4320f350a69b8d4f7080e6033d2aafdd156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:49:16 +00:00
Kousik Kumar
736cf4ed7d Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4 am: e252ef195e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: Idf665996d974be9510580ec85e87552854dedf7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:46:15 +00:00
Zi Wang
5d982b398e Merge changes from topic "drop_deps_no_srcs" into main
* changes:
  Always drop deps from java_library with no srcs
  Do not append deps to exports when java_library has only proto srcs
2023-09-15 20:39:35 +00:00
Edward Liaw
f3b7e79cc7 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main 2023-09-15 20:33:46 +00:00
Treehugger Robot
12fb0d47d5 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: I6f50034f3817c7d6d63283c7d08704f42970a84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:07:13 +00:00
Kousik Kumar
e252ef195e Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I4bab93cf43b27387cf3ed2038f57d8364caf2c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:05:45 +00:00
Treehugger Robot
5293f01b3f Merge "Implement bp2build converter for fdo_profile" into main 2023-09-15 19:54:22 +00:00