Commit Graph

52847 Commits

Author SHA1 Message Date
Treehugger Robot
e558319465 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461 am: 76df6461c5 am: 0d3522cece
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Ia74c51187284aad60b8e700c488a60a0083f4cfc
2021-11-11 07:35:58 +00:00
Treehugger Robot
0d3522cece Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461 am: 76df6461c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Ie19685e00abd7ed0bbd5d996e4a8c0ff8d196f97
2021-11-11 07:15:46 +00:00
Treehugger Robot
76df6461c5 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: I250db810ea0fb14a771020ca5a8b97412b0d3a3f
2021-11-11 06:53:11 +00:00
Treehugger Robot
331599f461 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: I5ed46ac3c26cb140f641eb2c5d0db10632124f19
2021-11-11 06:42:38 +00:00
Treehugger Robot
0a93afc2b9 Merge changes I9e38ac73,I9412147f am: 45da465ef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Iafcd3607b170c25f1585bf152397ee86105c8be4
2021-11-11 06:28:38 +00:00
Treehugger Robot
45da465ef6 Merge changes I9e38ac73,I9412147f
* changes:
  Honor PreventInstall for APKs and dexpreopt files
  Add dependency from hostdex installed module to Make intermediates
2021-11-11 06:10:26 +00:00
Treehugger Robot
8ebb5e9b3a Merge "Dump deps for native and java to json files." am: 008d17612a am: 17550eb4a0 am: 1dde18a42c am: 4c9cb33365 am: 43d724ab16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: Ice7462a409b063f4b8e991c00f2233ed27b72796
2021-11-11 05:57:56 +00:00
Treehugger Robot
43d724ab16 Merge "Dump deps for native and java to json files." am: 008d17612a am: 17550eb4a0 am: 1dde18a42c am: 4c9cb33365
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: I1f6706feb7a0bb17f286bb34b2f4eec10e7f2dd3
2021-11-11 05:38:52 +00:00
Treehugger Robot
4c9cb33365 Merge "Dump deps for native and java to json files." am: 008d17612a am: 17550eb4a0 am: 1dde18a42c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: I1c900b7bb54ebc7bb21f2663da8a5510fd43ba57
2021-11-11 05:22:48 +00:00
Treehugger Robot
1dde18a42c Merge "Dump deps for native and java to json files." am: 008d17612a am: 17550eb4a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: I5ab76c55ed1e375b18fdd83fa88e290f6ea6f454
2021-11-11 05:04:51 +00:00
Treehugger Robot
17550eb4a0 Merge "Dump deps for native and java to json files." am: 008d17612a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: I3a9b537606b6c39d9d89a4e289aab29b44550a4a
2021-11-11 04:49:34 +00:00
Treehugger Robot
008d17612a Merge "Dump deps for native and java to json files." 2021-11-11 04:48:16 +00:00
Treehugger Robot
07d7f81da3 Merge "Flag 'override' directives." am: 2a8105d19e am: 5f46e246aa am: 5c4824d8f2 am: fbe5e4d243 am: 079e3f1fb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: I0c4e9e25273c853e1bc194bc7311f2c4ecbcdfbc
2021-11-11 04:41:37 +00:00
Treehugger Robot
079e3f1fb1 Merge "Flag 'override' directives." am: 2a8105d19e am: 5f46e246aa am: 5c4824d8f2 am: fbe5e4d243
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: I9b7bf5cc6e32e3d10a30fb34626b4862ae476c4d
2021-11-11 04:21:14 +00:00
Treehugger Robot
fbe5e4d243 Merge "Flag 'override' directives." am: 2a8105d19e am: 5f46e246aa am: 5c4824d8f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: If67df318803d51fb5062c2d9e87b777546c55f7c
2021-11-11 04:10:10 +00:00
Treehugger Robot
5c4824d8f2 Merge "Flag 'override' directives." am: 2a8105d19e am: 5f46e246aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: Ic11b91ee8fc16db35f2aaa5f0cee8181b7a76616
2021-11-11 03:52:59 +00:00
Treehugger Robot
5f46e246aa Merge "Flag 'override' directives." am: 2a8105d19e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: Ib6640605a722410a026c710dc2bab66d45bf7f0e
2021-11-11 03:34:38 +00:00
Treehugger Robot
2a8105d19e Merge "Flag 'override' directives." 2021-11-11 03:17:11 +00:00
Matthew Maurer
03f40ff1bd Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc am: 534240991e am: a03b81046e am: 9227500807 am: a57e5beb3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: Id7204f8cb803150276158cd8105b6b4599cc75c8
2021-11-11 01:18:17 +00:00
Matthew Maurer
a57e5beb3a Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc am: 534240991e am: a03b81046e am: 9227500807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: Ice99a93d1d72be37ddbc6f11eaafb7b147c0e492
2021-11-11 01:00:25 +00:00
Matthew Maurer
9227500807 Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc am: 534240991e am: a03b81046e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: Ib3c20c92d405ffcff2a43219ff60a4ed8561c39e
2021-11-11 00:42:48 +00:00
Colin Cross
fa9bfcd0d2 Honor PreventInstall for APKs and dexpreopt files
Native coverage builds create a second variant of APKs and set
PreventInstall on the non-coverage variant.  Skip calling
ctx.InstallFile for APKs and in dexpreopt when PreventInstall
is set.

Fixes: 205865567
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device external/compiler-rt external/clang external/llvm external/swiftshader/third_party/llvm-10.0"
Change-Id: I9e38ac737315db12475e8f9bfb3e0e7c0327fc06
2021-11-10 16:42:38 -08:00
Matthew Maurer
a03b81046e Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc am: 534240991e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: I239d8b5a22cb4b5f1477576822f404b2ae0f7a14
2021-11-11 00:31:24 +00:00
Matthew Maurer
534240991e Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: I76629a7decc0131915688b01f82be96141091704
2021-11-11 00:13:21 +00:00
Matthew Maurer
739edbc0bc Merge "Update the Rust prebuilt version number to 1.56.1" 2021-11-10 23:57:44 +00:00
Ivan Lozano
b343ea05e8 Merge "rust: Refactor stripped output file path" am: aa1a9e4086 am: 0ff16932dc am: 5eb18136e6 am: ea246aec58 am: 89c55516c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188

Change-Id: I6e0fbcb6a4d093c98627c65b121deaa3168f77e2
2021-11-10 23:03:18 +00:00
Cole Faust
2045e8fa71 Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c am: 136a1cf5c3 am: 1f112ecc64 am: 7b59d014f1 am: 3f010babb2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698

Change-Id: I4edcd4380ab71401e42b3a5cc68eeadbe220a06e
2021-11-10 23:03:05 +00:00
Ivan Lozano
89c55516c4 Merge "rust: Refactor stripped output file path" am: aa1a9e4086 am: 0ff16932dc am: 5eb18136e6 am: ea246aec58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188

Change-Id: Ic1eafd1552219f0c0e2dcd385a5a0ad507f60113
2021-11-10 22:46:24 +00:00
Cole Faust
3f010babb2 Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c am: 136a1cf5c3 am: 1f112ecc64 am: 7b59d014f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698

Change-Id: Iabc358517dd6eec0d3ba00980fcad02b5b5689bf
2021-11-10 22:46:15 +00:00
Colin Cross
3108ce17b0 Add dependency from hostdex installed module to Make intermediates
The art tests rely on a dependency existing from
out/host/linux-x86/framework/core-oj-hostdex.jar to
out/host/common/obj/JAVA_LIBRARIES/core-oj-hostdex_intermediates/classes.jar,
override LOCAL_SOONG_INSTALLED_MODULE for the hostdex modules so that
soong_java_prebuilt.mk adds the dependency.

Test: art/tools/buildbot-build.sh --host && art/tools/run-libcore-tests.sh '--mode=host' '--variant=X64' --debug
Change-Id: I9412147fc66d5e5f0dae52d522868a37251f781e
2021-11-10 14:38:50 -08:00
Ivan Lozano
ea246aec58 Merge "rust: Refactor stripped output file path" am: aa1a9e4086 am: 0ff16932dc am: 5eb18136e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188

Change-Id: I4ead04ec7a93d08e225db2b3038a485477d553d5
2021-11-10 22:27:54 +00:00
Cole Faust
7b59d014f1 Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c am: 136a1cf5c3 am: 1f112ecc64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698

Change-Id: Iab530256fdc2f32321db87aa2f892f66d4b2ee78
2021-11-10 22:27:46 +00:00
Ivan Lozano
5eb18136e6 Merge "rust: Refactor stripped output file path" am: aa1a9e4086 am: 0ff16932dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188

Change-Id: I4b27e06fd385e92dfb7b29f4c4c6c7d6372fe812
2021-11-10 22:10:20 +00:00
Ivan Lozano
ee0d0ca06c Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8 am: c2f3eae89f am: 02096a3676 am: bd0f686d67 am: 30199426b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235

Change-Id: I59f0473db00264d6e8d70ce29b94b5a9a65897be
2021-11-10 22:10:15 +00:00
Cole Faust
1f112ecc64 Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c am: 136a1cf5c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698

Change-Id: Ibd9d88679d0084b73dfb2a45d7b736175bbf48a3
2021-11-10 22:10:13 +00:00
Ivan Lozano
0ff16932dc Merge "rust: Refactor stripped output file path" am: aa1a9e4086
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188

Change-Id: If32e2f956ca437a09b743be227a921f7ff568064
2021-11-10 21:51:30 +00:00
Cole Faust
136a1cf5c3 Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698

Change-Id: I9cabb7ba502a071c9d82f6fe2ed4393299392dca
2021-11-10 21:51:24 +00:00
Ivan Lozano
30199426b7 Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8 am: c2f3eae89f am: 02096a3676 am: bd0f686d67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235

Change-Id: I1adf6d47e5c95007d5544c1b40f92b990838901e
2021-11-10 21:50:53 +00:00
Cole Faust
21bb057973 Merge "Translate soong_config_get calls to rbc" am: 18e7785f26 am: 941fe6f384 am: 52bca93bbe am: 85674d2a43 am: 247b1a9aef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883264

Change-Id: I657cdebb119b0fd81f353f805547beebf4aab298
2021-11-10 21:34:51 +00:00
Ivan Lozano
bd0f686d67 Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8 am: c2f3eae89f am: 02096a3676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235

Change-Id: I50e80b6b7ea232109a63d7ea6f267409bbc34422
2021-11-10 21:34:46 +00:00
Ivan Lozano
aa1a9e4086 Merge "rust: Refactor stripped output file path" 2021-11-10 21:34:21 +00:00
Cole Faust
f8ff9cf68c Merge "Enable mk2rbc warnings/errors by default" 2021-11-10 21:29:26 +00:00
Sasha Smundak
ea3bc3a953 Flag 'override' directives.
Bug: 201087531
Test: internal
Change-Id: I2e08b126d769b1595172b04a3539e99b3e72cb2b
2021-11-10 13:19:01 -08:00
Ivan Lozano
02096a3676 Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8 am: c2f3eae89f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235

Change-Id: I840fde80696b347b620d74c21454784b066be499
2021-11-10 21:17:25 +00:00
Cole Faust
247b1a9aef Merge "Translate soong_config_get calls to rbc" am: 18e7785f26 am: 941fe6f384 am: 52bca93bbe am: 85674d2a43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883264

Change-Id: I6713683c9d9a3f562c5dc73461a73c51a22721ec
2021-11-10 21:15:57 +00:00
Ivan Lozano
c2f3eae89f Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235

Change-Id: Idacef9ecf768839d755bf7898a51d45bb43d8875
2021-11-10 21:00:23 +00:00
Cole Faust
85674d2a43 Merge "Translate soong_config_get calls to rbc" am: 18e7785f26 am: 941fe6f384 am: 52bca93bbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883264

Change-Id: Idcf9e973919652d0aa5be7e0109f05a041939583
2021-11-10 20:59:26 +00:00
Ivan Lozano
fe700e19c8 Merge "rust: Add missing variation -D flags to bindgen." 2021-11-10 20:47:39 +00:00
Cole Faust
52bca93bbe Merge "Translate soong_config_get calls to rbc" am: 18e7785f26 am: 941fe6f384
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883264

Change-Id: I8df94733937328dfd2f63be532ab9b2f36bb2eda
2021-11-10 20:41:27 +00:00
Colin Cross
865ce7d95c Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... am: 02ce1e7833 am: 6ea1d5be60 am: e68193dcbc am: dee1a86a44 am: 011778d5ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885956

Change-Id: I94f3c2c9c6d2ed6c410d6611dbc7493ec9995ea6
2021-11-10 20:41:05 +00:00