Commit Graph

74029 Commits

Author SHA1 Message Date
Colin Cross
da96e09014 Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15 am: 286806fe61 am: d0f8e7b899 am: ca9d685248 am: 768dd7570f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: I09a42641fbd716eea8bc5408db8ac5aa7874efa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:45:02 +00:00
Colin Cross
768dd7570f Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15 am: 286806fe61 am: d0f8e7b899 am: ca9d685248
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: Ia3617ad608d55da1a8d0a375325bbb4fc4bfca0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:56:56 +00:00
Steven Moreland
570e3f9236 Merge "Linker: no demangle." into main am: c8a5d7c7df am: fb423b5d6e am: ed2b738fb4 am: d983899aa8 am: 67c919a1fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Iababa5a680961acc32c190272a9b859e1b0206a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:43:03 +00:00
Colin Cross
ca9d685248 Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15 am: 286806fe61 am: d0f8e7b899
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: I934f3d358f2334207b8b3d14abe92a44ca10fdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:15:50 +00:00
Steven Moreland
67c919a1fa Merge "Linker: no demangle." into main am: c8a5d7c7df am: fb423b5d6e am: ed2b738fb4 am: d983899aa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Ica6a938178f6c38702de393645b58c58fc9709fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:53:30 +00:00
Treehugger Robot
cfd57e032e Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614 am: cd520ba878 am: dee3bad259 am: e2f6286979
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: I298f5b82c5198ab5e8cbeedc3686abcb740fb938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:33:05 +00:00
Prashanth Swaminathan
4e274556ab Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce am: 04cc93c7e1 am: d191c0713f am: 7348cc8baf am: 01b39b45c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: I45d082812210bb6978869479f8799e804462026d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:33:00 +00:00
Colin Cross
d0f8e7b899 Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15 am: 286806fe61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: I9632f28c1b227b6e2d52c25a0b65253b634e29a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:31:26 +00:00
Treehugger Robot
e2f6286979 Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614 am: cd520ba878 am: dee3bad259
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: Icdb0ff2934e65de2cf31d3d787d6f1412f4e6bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:29:24 +00:00
Prashanth Swaminathan
01b39b45c7 Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce am: 04cc93c7e1 am: d191c0713f am: 7348cc8baf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: I414d6b91cc445590f381e4a924feed28beca92c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:29:19 +00:00
Steven Moreland
d983899aa8 Merge "Linker: no demangle." into main am: c8a5d7c7df am: fb423b5d6e am: ed2b738fb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Ibd981d91ea4c4b6626edd39f96e6894f849cad52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:53:19 +00:00
Treehugger Robot
dee3bad259 Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614 am: cd520ba878
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: Id5de4d56f1d464a54337be70956d1142da15c204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:51:38 +00:00
Prashanth Swaminathan
7348cc8baf Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce am: 04cc93c7e1 am: d191c0713f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: I0eb7cb6217d8952cdd15f399535d6a0a43b48ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:51:35 +00:00
Colin Cross
286806fe61 Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: I4b3483fc0ca17cb963a62bb194d6c9389304f5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:43:53 +00:00
Colin Cross
a706cc8c15 Merge "Avoid extra copy of JNI libs zip" into main 2023-07-27 20:11:20 +00:00
Steven Moreland
ed2b738fb4 Merge "Linker: no demangle." into main am: c8a5d7c7df am: fb423b5d6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Ia96df3f2624c87042663978ccb9beaae847e0b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:04:17 +00:00
Treehugger Robot
cd520ba878 Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: I6e6410fc9c593a2d45dd378e3806b9c21c01c11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:00:36 +00:00
Prashanth Swaminathan
d191c0713f Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce am: 04cc93c7e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: I35907111af472dc55166c7fbe7f5c41c39a5967d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:00:30 +00:00
Ivan Lozano
463a53e49c Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e am: ba1e3a5756 am: 1db5a3befc am: 050c466794 am: 8aeaffdf09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: Ic9855fcd2a81f24c9eee79ec12260b4a5564668e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:12:24 +00:00
Ivan Lozano
be74c73fc3 Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e am: 083130ebf7 am: 96cbaef580 am: 04c6badd7b am: dc1f2ba3f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: I300ee4c7462de065c844a56f38c9061fb91d022f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:09:02 +00:00
Steven Moreland
fb423b5d6e Merge "Linker: no demangle." into main am: c8a5d7c7df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Ieeb3c12e2e0127a07c9104c99ebccd8dffacf4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:28 +00:00
Treehugger Robot
83290c0614 Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: I37fa812ea97514441b41a3394df05326ccf88592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:11 +00:00
Prashanth Swaminathan
04cc93c7e1 Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: Iaa4372f32bc33f12b92bd2cede1d781ce0376da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:06 +00:00
Ivan Lozano
8aeaffdf09 Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e am: ba1e3a5756 am: 1db5a3befc am: 050c466794
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: I37ad54725692c33ba499af38ed75d813abb6732c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 18:19:39 +00:00
Steven Moreland
c8a5d7c7df Merge "Linker: no demangle." into main 2023-07-27 18:19:09 +00:00
Treehugger Robot
db195fd4cb Merge changes from topic "reland-hack-rv64-libc++" into main
* changes:
  Revert "Revert "Set VIC as minimum SDK version for riscv64""
  Revert "Revert "Use prebuilt NDK libc++ for rv64.""
2023-07-27 18:17:35 +00:00
Ivan Lozano
dc1f2ba3f3 Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e am: 083130ebf7 am: 96cbaef580 am: 04c6badd7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: Ifbc6b1f6eb1cec9664026712e0fc8f899b1b5e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 18:16:45 +00:00
Ivan Lozano
050c466794 Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e am: ba1e3a5756 am: 1db5a3befc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: Ifcd23a7ab0b27245b8e092202451f15f2227048d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 17:14:54 +00:00
Ivan Lozano
04c6badd7b Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e am: 083130ebf7 am: 96cbaef580
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: I11f9d43c5ec4937b8daf6bee5c08a5b36d541bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 17:12:43 +00:00
Ivan Lozano
1db5a3befc Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e am: ba1e3a5756
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: I47d74dda776895e456bb98923a214ea6cbcb212e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 16:29:49 +00:00
Ivan Lozano
96cbaef580 Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e am: 083130ebf7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: I6c0cd6817650227800ea8fd4f3f90d2ed8153f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 16:29:14 +00:00
Ivan Lozano
ba1e3a5756 Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: I93e790922089abe24780f42cc30b401bdfabfe3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 15:27:07 +00:00
Colin Cross
b3168bac7f Avoid extra copy of JNI libs zip
Don't call merge_zips if there are no prebuilt JNI libraries to
merge with.

Test: builds
Change-Id: Ife5386fbbfcff35bdea2914519a78dfd89163a25
2023-07-27 08:09:37 -07:00
Ivan Lozano
7e377d045e Merge "Revert "rust: Add SCS sanitizer option."" into main 2023-07-27 15:08:50 +00:00
Ivan Lozano
083130ebf7 Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: Ic8944725bbd3f0dfa495e0704acfefafc86a69d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 15:05:00 +00:00
Ivan Lozano
f9780422b3 Revert "rust: Add SCS sanitizer option."
This reverts commit 447f5b1ea9.

Reason for revert: b/293445283

Change-Id: Iadc6c7ed196be2a65329f86423730ba7f851002c
2023-07-27 14:52:20 +00:00
Ivan Lozano
c7c29b9b8e Merge "rust: Add SCS sanitizer option." into main 2023-07-27 14:23:33 +00:00
Kiyoung Kim
163507f71c Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2 am: 502be69c12 am: 66eeebf02a am: a5704fdc2f am: df794a5f0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: I3f1dd9b5ce63a163e112e94959931f870b9f7a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 05:46:28 +00:00
Kiyoung Kim
df794a5f0b Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2 am: 502be69c12 am: 66eeebf02a am: a5704fdc2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: Ia41e8381baa1bd4df5be606acf2d655fa8a082ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 04:40:59 +00:00
Treehugger Robot
3deee3ed71 Merge "Denylist new libart modules" into main am: 68dbdda54c am: 4f89221695 am: 4c596921d5 am: 87c73395ab am: cfefa3cbd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: I5561e0c215ee687378dc544a8409949d88159423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:57:16 +00:00
Kiyoung Kim
a5704fdc2f Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2 am: 502be69c12 am: 66eeebf02a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: If3333a0bc8d5fc11da2fc81af242610abe2edc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:56:56 +00:00
Kiyoung Kim
66eeebf02a Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2 am: 502be69c12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: I40885160862ba30b263c7096ccb717c50be876c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:15:10 +00:00
Treehugger Robot
cfefa3cbd2 Merge "Denylist new libart modules" into main am: 68dbdda54c am: 4f89221695 am: 4c596921d5 am: 87c73395ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: I34ffdea8bca8d3c413f96ab1a0c0c176a57e48a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:11:48 +00:00
Treehugger Robot
87c73395ab Merge "Denylist new libart modules" into main am: 68dbdda54c am: 4f89221695 am: 4c596921d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: Ieb2f19cb65ba79d7c7423e0ff189a72eafd9e332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 02:30:17 +00:00
Kiyoung Kim
502be69c12 Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: I8ff443360272932b8c232c76f29973eed7757732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 02:29:27 +00:00
Kiyoung Kim
f97a42e5f2 Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main 2023-07-27 01:24:53 +00:00
Treehugger Robot
4c596921d5 Merge "Denylist new libart modules" into main am: 68dbdda54c am: 4f89221695
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: I643ff2252fd2f557733bbea6b23836d7d836cd08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 01:20:13 +00:00
Devin Moore
bee8b95640 Merge "Add new Release_aidl_use_unfrozen soong variable" into main am: 1579a72d78 am: 211e090d28 am: 38a9b8a61c am: 84be4996dd am: 1e4f40a108
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652369

Change-Id: I9cfab7f092548f1c85b7d8fdf4073bbad08f99c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 01:19:21 +00:00
Treehugger Robot
4f89221695 Merge "Denylist new libart modules" into main am: 68dbdda54c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: I387ac3c103f2fdbb52b9c6f949edfed68d770e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:40:19 +00:00
Devin Moore
1e4f40a108 Merge "Add new Release_aidl_use_unfrozen soong variable" into main am: 1579a72d78 am: 211e090d28 am: 38a9b8a61c am: 84be4996dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652369

Change-Id: I22d07276a86a2e359aea23e9de5aeabae80044d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:32:19 +00:00