Commit Graph

44864 Commits

Author SHA1 Message Date
Ulyana Trafimovich
ade9fe9d53 Merge "Don't add uses_libs/optional_uses_libs to the manifest_fixer." am: 81a1adb6db am: affc7d8116 am: 4870f2b0cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803744

Change-Id: Ic0b3e6aaf05b3245f44c9f70f1ccefc8138ced33
2021-08-24 10:30:35 +00:00
Ulyana Trafimovich
4870f2b0cb Merge "Don't add uses_libs/optional_uses_libs to the manifest_fixer." am: 81a1adb6db am: affc7d8116
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803744

Change-Id: I8b76722fb92b2ae46987fc6f5d2a458fed755176
2021-08-24 10:19:50 +00:00
Ulyana Trafimovich
affc7d8116 Merge "Don't add uses_libs/optional_uses_libs to the manifest_fixer." am: 81a1adb6db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803744

Change-Id: Id5c9f8a14ddd00eaedde4d404d4773fc2c214c1a
2021-08-24 09:46:13 +00:00
Ulyana Trafimovich
81a1adb6db Merge "Don't add uses_libs/optional_uses_libs to the manifest_fixer." 2021-08-24 09:18:06 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
f84c97aafb Merge changes from topic "share-runBp2BuildTestCase+runPythonTestCase" am: 5272a41283 am: 4805e3f0f6 am: ed0222b313
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1805664

Change-Id: I895c0ec457c373ec4aa3a06ee4da04cf71d2b404
2021-08-24 01:54:21 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
ed0222b313 Merge changes from topic "share-runBp2BuildTestCase+runPythonTestCase" am: 5272a41283 am: 4805e3f0f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1805664

Change-Id: I705e040d31a9819b8067c716d06c78696e1071eb
2021-08-24 01:41:16 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
4805e3f0f6 Merge changes from topic "share-runBp2BuildTestCase+runPythonTestCase" am: 5272a41283
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1805664

Change-Id: Icc0685d03296fcbc30de7951ad8168e93f47d26b
2021-08-24 01:25:53 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
5272a41283 Merge changes from topic "share-runBp2BuildTestCase+runPythonTestCase"
* changes:
  Add License decl to testing.go
  Document testing & build_conversion purposes
  Rename runPythonTestCase
  Share runBp2BuildTestCase & runPythonTestCase
2021-08-24 01:11:14 +00:00
Treehugger Robot
12f8fc3b9b Merge "Apply pylint to build/soong/cc/ndk_api_coverage_parser" am: 373e71c5d4 am: a41f24c545 am: 88e568051c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797008

Change-Id: I335c58b81949e4b4e928fa0c83a8e0397276ddde
2021-08-23 23:30:34 +00:00
Treehugger Robot
88e568051c Merge "Apply pylint to build/soong/cc/ndk_api_coverage_parser" am: 373e71c5d4 am: a41f24c545
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797008

Change-Id: Icde5c03976b56103322ea0e9529f651a8b887fce
2021-08-23 23:10:42 +00:00
Treehugger Robot
a41f24c545 Merge "Apply pylint to build/soong/cc/ndk_api_coverage_parser" am: 373e71c5d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797008

Change-Id: I4bfd96c5da8cba12fb1db0059db6f85e2aede684
2021-08-23 22:57:13 +00:00
Treehugger Robot
373e71c5d4 Merge "Apply pylint to build/soong/cc/ndk_api_coverage_parser" 2021-08-23 22:42:05 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
f5a3eacc07 Add License decl to testing.go
Test: Existing tests pass
Change-Id: I0d8b77d87801cb361036c8788f30bd80070fd7ff
2021-08-23 22:07:12 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
0da7ce6f39 Document testing & build_conversion purposes
Formatter also relocated some imports

Test: Existing tests pass
Change-Id: I48b1cb65400e463a6b4e91fd9fe76e13d8d81cd6
2021-08-23 22:04:53 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
ce0a07e249 Rename runPythonTestCase
To runBp2BuildTestCaseSimple because it's not Python-specific
but rather Bp2Build-specific

Name is suboptimal but given current functionality and use
we couldn't come up with a better one.

Test: Existing tests pass
Change-Id: I641cd051af741836b21ec6a7d6639516fb13028f
2021-08-23 22:02:20 +00:00
Colin Cross
e56c1171e5 Merge "Set ANDROID_HOST_MUSL for musl builds" am: b3c68004af am: a07b7cde23 am: ef9db40143
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797128

Change-Id: I627f78f6381278dc626d472440adcd6122b782c0
2021-08-23 19:46:16 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
1c92aeff4e Share runBp2BuildTestCase & runPythonTestCase
Pull along bp2buildTestCase as well
Because none are specific to their current hosts

Move `errored` up to the "generic" block vs.
the "custom" block

Test: Existing tests pass
Change-Id: Ie8d5322a5554ebd88f0c142a4c541791687be326
2021-08-23 19:20:29 +00:00
Colin Cross
ef9db40143 Merge "Set ANDROID_HOST_MUSL for musl builds" am: b3c68004af am: a07b7cde23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797128

Change-Id: I71a75ee9c93b18dcc408105dbfc3615173aba3a5
2021-08-23 19:19:38 +00:00
Colin Cross
a07b7cde23 Merge "Set ANDROID_HOST_MUSL for musl builds" am: b3c68004af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797128

Change-Id: I507b8c13036a6fcd639846641274bffb1f545446
2021-08-23 19:03:04 +00:00
Colin Cross
b3c68004af Merge "Set ANDROID_HOST_MUSL for musl builds" 2021-08-23 18:47:40 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
9870ab1cab Merge "Fix inverted error message" am: 8f33dcc9e3 am: b8cc59cfd3 am: ee9c499267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804261

Change-Id: Ice5223cde0d9a3de8d4c09f11efba8e5ac13eb8d
2021-08-20 22:58:16 +00:00
Treehugger Robot
804943ee8e Merge "rust: doc: Zip up docs when done" am: 899b98d508 am: 6506614e2b am: 43f89f2ddd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804477

Change-Id: Ic3042dce8395cec92ddc69cc65bd9413fcc78b49
2021-08-20 22:58:06 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
ee9c499267 Merge "Fix inverted error message" am: 8f33dcc9e3 am: b8cc59cfd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804261

Change-Id: Ib360cbbc1877123977079fb71ec75a5f911b4e62
2021-08-20 22:44:54 +00:00
Treehugger Robot
43f89f2ddd Merge "rust: doc: Zip up docs when done" am: 899b98d508 am: 6506614e2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804477

Change-Id: I5468d4bbc135c828980eb5444e07709e1bbdcde5
2021-08-20 22:44:12 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
b8cc59cfd3 Merge "Fix inverted error message" am: 8f33dcc9e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804261

Change-Id: I24d402da44ff2378beb1c5e15b1380318a4aa087
2021-08-20 22:28:04 +00:00
Treehugger Robot
6506614e2b Merge "rust: doc: Zip up docs when done" am: 899b98d508
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1804477

Change-Id: I42e978357851b56463f43ec801edf33b6ee918ae
2021-08-20 22:27:57 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
8f33dcc9e3 Merge "Fix inverted error message" 2021-08-20 22:20:23 +00:00
Treehugger Robot
899b98d508 Merge "rust: doc: Zip up docs when done" 2021-08-20 22:11:17 +00:00
Treehugger Robot
52ffd03b17 Merge "rust: Hook up InstallIn functions + Product" am: 13b3b785ec am: d7bfb87eec am: 42a2a1e643
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803098

Change-Id: I4653d7f4af88e2830a1ae50607a53c81d62b9378
2021-08-20 22:09:51 +00:00
Treehugger Robot
42a2a1e643 Merge "rust: Hook up InstallIn functions + Product" am: 13b3b785ec am: d7bfb87eec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803098

Change-Id: I408691811f547dd995807601ac49bad3f934fb3e
2021-08-20 21:54:55 +00:00
Treehugger Robot
d7bfb87eec Merge "rust: Hook up InstallIn functions + Product" am: 13b3b785ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803098

Change-Id: If1663681714e738b934ca637ba3274b755e1e7d7
2021-08-20 21:40:39 +00:00
Treehugger Robot
13b3b785ec Merge "rust: Hook up InstallIn functions + Product" 2021-08-20 21:03:18 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
d75507fff7 Fix inverted error message
The code checks to see if the `child` is not a Python library,
but then when reporting the error it uses the module name as
the dependency name and the child (dependency) as the module name

Test: Existing tests pass
Change-Id: Ied606342291312d8485a8fd2ddcc580ad24ae82f
2021-08-20 21:02:43 +00:00
Matthew Maurer
ca68c49621 rust: doc: Zip up docs when done
Fetching artifacts from the build server doesn't go well with large
numbers of files in nested directories.

Produce an additional rustdoc.zip artifact to make this easier.

This change also prevents ${DIST} from receiving the unpacked rustdoc
site. This can be changed if b/188822051 is fixed.

Bug: 162741284
Test: m rustdoc; check resulting zip contents manually
Change-Id: I80b6a8fa6e274d2d8c3419d8734251afd4d7dba7
2021-08-20 13:08:16 -07:00
Matthew Maurer
9f59e8db27 rust: Hook up InstallIn functions + Product
InstallIn functions must be hooked up not only to install to special
images, but also to receive special handling by android/arch.go such
that some images are implicitly multilib: first.

Also hook up more product details.

Bug: 178565008
Bug: 165791368
Test: lunch aosp_arm64; m
Change-Id: I1980d5aa9d55f78c222b98d60a404cd6ea5abbfb
2021-08-20 12:14:54 -07:00
Ulya Trafimovich
0b1c70efbc Don't add uses_libs/optional_uses_libs to the manifest_fixer.
These properties specify libraries that cannot be implicitly inferred by
Soong. If these properties are added to Android.bp, this can only be for
the reason that there is a <uses-library> tag in the manifest which is
unknown to the build system. Adding them to the manifest_fixer doesn't
make sense: if they are not in the manifest, they should be removed from
Android.bp as well.

Bug: 132357300
Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && adb root && adb logcat \
        | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
        # empty grep output, no errors
Change-Id: Ic6eb5268a954ef3be7f06a181ec72af99000c547
2021-08-20 15:54:42 +01:00
Treehugger Robot
f6cda86915 Merge "Revert "Revert "Apply pylint to cc/symbolfile""" am: 99d5a0f5c9 am: bc3bbf81bc am: afa8400906
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1802996

Change-Id: If97173a28536fc3ee2aeac2e27f4e7d7b9053b8e
2021-08-19 21:32:48 +00:00
Treehugger Robot
afa8400906 Merge "Revert "Revert "Apply pylint to cc/symbolfile""" am: 99d5a0f5c9 am: bc3bbf81bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1802996

Change-Id: I6c4a6b01ab88d43d832496488d665046c5f4115b
2021-08-19 21:20:55 +00:00
Treehugger Robot
bc3bbf81bc Merge "Revert "Revert "Apply pylint to cc/symbolfile""" am: 99d5a0f5c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1802996

Change-Id: Iadfdedc4664a3e8717d29ddaa143acf8c71c18e6
2021-08-19 21:07:14 +00:00
Treehugger Robot
99d5a0f5c9 Merge "Revert "Revert "Apply pylint to cc/symbolfile""" 2021-08-19 20:51:40 +00:00
Treehugger Robot
9ffb63b9dc [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours am: 5fa40b1a2b -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ibac8a4902851b4e414acaaf29b6f39300d712368
2021-08-19 19:56:33 +00:00
Automerger Merge Worker
754f109ec6 Merge "[automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am: 1ffe58c42b -s ours" into sc-qpr1-dev-plus-aosp 2021-08-19 19:56:24 +00:00
Treehugger Robot
68dc75c2b6 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am: 1ffe58c42b -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ide938a6889cb064dadf2bf8c75a5af0755946c61
2021-08-19 19:56:22 +00:00
Treehugger Robot
2b5ff723e6 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours am: 175f629daf -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I3f0e0e8e00c7f69b5338dfbf0cb22d62d74241a2
2021-08-19 19:56:20 +00:00
Treehugger Robot
4a2eb6c18e [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am: 026c7798fd -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I157bf965febdb19d95ba8f8ee029c6066ac27b56
2021-08-19 19:56:04 +00:00
Treehugger Robot
5fa40b1a2b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I74586233adc72131f77e4fb6c6ee777df07dffd2
2021-08-19 19:40:34 +00:00
Treehugger Robot
1ffe58c42b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I7169df1cda5f89648159bff750aea245384346a6
2021-08-19 19:40:30 +00:00
Treehugger Robot
175f629daf [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I4f17aa781d540584bb1af6688882692a5e81998a
2021-08-19 19:38:48 +00:00
Treehugger Robot
026c7798fd [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I86a76f209b7a3241525d9aded0ba9387905a2375
2021-08-19 19:38:43 +00:00
Spandan Das
3f5659f268 Revert "Revert "Apply pylint to cc/symbolfile""
This reverts commit ea28f4cae7.

Reason for revert: Postsubmit failure was unrelated, and was fixed by this revert CL aosp/1802327

Change-Id: I2693b17c2261cfc3dce0ed69baeb2d1f45f784f8
2021-08-19 19:31:54 +00:00