Commit Graph

46175 Commits

Author SHA1 Message Date
Cole Faust
65f298ca63 Remove MainNinjaFile()
It was the same as SoongNinjaFile, except it used
shared.JoinPath instead of filepath.Join, which
doesn't matter here because the second argument
is never an absolute path.

Test: Presubmits
Change-Id: I95e64a8b8971bd168a1dc6670ae80f4d336045b5
2021-10-28 16:05:13 -07:00
Joe Onorato
83fdc94102 Add support for java streaming proto
Test: m services with ag/15937571 applied
Bug: 199427116
Change-Id: Icf262efa015900f14d9f4cabe3b8af7ec872a668
2021-10-28 15:08:34 -07:00
Treehugger Robot
5bb9910ea6 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825 am: e68637799b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

Change-Id: I06866aa4143a23fea360ff4ff34b6164adac4174
2021-10-28 21:24:37 +00:00
Treehugger Robot
e68637799b Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

Change-Id: I8649a96869b3c28f089feef84464195fe354a2da
2021-10-28 21:06:30 +00:00
Treehugger Robot
c9e85ca825 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." 2021-10-28 20:51:17 +00:00
Treehugger Robot
abc098722a Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f am: 0be9038df8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

Change-Id: Ia9ea1967319ebd46b6a3414ddadd7c3b5dbfbd49
2021-10-28 20:30:45 +00:00
Sasha Smundak
10830a05de Fix how the rule is displayed in the error message. am: 2afb9d7722 am: 58c231b69e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1868384

Change-Id: Idb6d5b7272707dda515af352505b8a72bf651873
2021-10-28 20:30:45 +00:00
Sasha Smundak
9069284053 Implement include path annotation. am: 6d852dd16a am: a9aacce883
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846795

Change-Id: Icfed85edf3beb906cbd849a8135f9099f54a65b2
2021-10-28 20:30:44 +00:00
Sasha Smundak
b331431cfe Better Soong config namespace support. am: 65b547edc2 am: 250d27639f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831854

Change-Id: I5fbdc617ae88244a5289e7814d489e4437e1f5f7
2021-10-28 20:30:42 +00:00
Colin Cross
1e7cfdea4a Make installable arch-variant for cc modules
libc's native_bridge variant needs to be installable: false, make
the installable property arch-variant.

Bug: 204136549
Test: m checkbuild
Change-Id: I8e0eaed2169e89520b07bb0326bb97ac0b4a70ac
2021-10-28 13:26:45 -07:00
Treehugger Robot
0be9038df8 Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

Change-Id: I03dfbb925ba084b1190b1407ee696cd51cf6dfe8
2021-10-28 20:13:02 +00:00
Sasha Smundak
58c231b69e Fix how the rule is displayed in the error message. am: 2afb9d7722
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1868384

Change-Id: I68e91a903606d7033a88fc353386378baf890757
2021-10-28 20:13:01 +00:00
Sasha Smundak
a9aacce883 Implement include path annotation. am: 6d852dd16a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846795

Change-Id: I9e44941345e0cc0d18aa948abb0925c77fb3ff5a
2021-10-28 20:13:01 +00:00
Sasha Smundak
250d27639f Better Soong config namespace support. am: 65b547edc2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831854

Change-Id: If2307050153fe0070d94e60980721d7954de65a3
2021-10-28 20:13:00 +00:00
Treehugger Robot
d0fb23705f Merge changes from topics "is_board_platform", "soong_config_namespace"
* changes:
  Convert is-board-platform2/is-board-platform-in-list2/is-vendor-board-qcom macros.
  Fix how the rule is displayed in the error message.
  Implement include path annotation.
  Better Soong config namespace support.
2021-10-28 19:57:09 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
5d5754f774 cc_prebuilt_library_shared converted via bp2build am: 7fa0696eb7 am: 66ca6a87ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871615

Change-Id: If641992b0ead562c3e3790fa3f085d831044f588
2021-10-28 19:06:36 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
66ca6a87ff cc_prebuilt_library_shared converted via bp2build am: 7fa0696eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871615

Change-Id: I27d8f970d4f268536fa69b1c4bf8c58549777991
2021-10-28 18:42:35 +00:00
Joe Onorato
b4638c1ac3 Make a pass over our codebase cleaning up non-precise / non-inclusive language.
Test: treehugger
Bug: 204369779
Change-Id: I6e63cae824d323535cdb14b493edd868df47738d
2021-10-28 10:32:07 -07:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
7fa0696eb7 cc_prebuilt_library_shared converted via bp2build
Bug: b/203699063
Test: bp2build/cc_prebuilt_library_shared_test.go
Test: USE_BAZEL_ANALYSIS=1 m nothing
Test: mixed_{libc,droid}.sh
Change-Id: I4c58224e88c31507a4b285f8c55bdc066bd47232
2021-10-28 11:04:50 -04:00
Samiul Islam
7b385c5677 Add exemption for test_framework-apexd and test_service-apexd jars
For testing purpose, we need to add java libraries to bootclasspath and
systemserverclasspath that are not present in PRODUCT_APEX_BOOT_JARS and
PRODUCT_APEX_SYSTEM_SERVER_JARS.

Currently, we can't unconditionally add all the contents to the config
for test APEXs. Until a formal way is introduced, hardcoding the
artifact in the build system like how it's done for
test_framework-sdkextensions.

Bug: 187444679
Test: atest ApexTestCases
Test: atest StagedInstallInternalTest
Change-Id: I1f7b01a57bc9c46163e025de2ab00e671a42b202
2021-10-28 06:12:48 +01:00
Keun young Park
d64ab233e4 Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS
- car-frameworks-service-module is added from com.android.car.framework
  apex which only exisits in car products.

Bug: 203233647
Bug: 203201931
Test: build, bootup
Change-Id: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
Merged-In: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
(cherry picked from commit 6e3ba9ac3b)
2021-10-28 06:12:26 +01:00
Treehugger Robot
17b6e97c92 Merge "Add path of uwb NativeManager to rust allowlist." am: 2a524318e4 am: 5aa3b275de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1872014

Change-Id: I9517edb4dd0ceeb23723e8f9c77af5b7204ad3ba
2021-10-27 21:43:06 +00:00
Treehugger Robot
5aa3b275de Merge "Add path of uwb NativeManager to rust allowlist." am: 2a524318e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1872014

Change-Id: I7f5010604c677ade490d8384ad808c778108aed0
2021-10-27 21:23:09 +00:00
Chih-hung Hsieh
9e2cb93d0a Merge "Do not add .tidy files as RBE link inputs" am: 4dceb3705f am: 6e1b62d2b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869384

Change-Id: I7d20f228304b7f7fa5022fe77fd96a502d0b7936
2021-10-27 21:14:08 +00:00
Treehugger Robot
2a524318e4 Merge "Add path of uwb NativeManager to rust allowlist." 2021-10-27 21:03:22 +00:00
Chih-hung Hsieh
6e1b62d2b1 Merge "Do not add .tidy files as RBE link inputs" am: 4dceb3705f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869384

Change-Id: I7066ab503f04d304aec9ff6634b51a16fc3c478c
2021-10-27 20:55:00 +00:00
Chih-hung Hsieh
4dceb3705f Merge "Do not add .tidy files as RBE link inputs" 2021-10-27 20:29:04 +00:00
ziyiw
f3d0222262 Add path of uwb NativeManager to rust allowlist.
Test: mmm
Bug: 197341298
Change-Id: I70a40f493efced15702dcd0f9ab50733ea23df9f
2021-10-27 11:28:17 -07:00
Sasha Smundak
3a9b8e8943 Convert is-board-platform2/is-board-platform-in-list2/is-vendor-board-qcom macros.
Bug: 193540681
Test: internal
Change-Id: I76c46d89f10b16b75438803479fec4aa468e3010
2021-10-27 11:23:29 -07:00
Sasha Smundak
2afb9d7722 Fix how the rule is displayed in the error message.
Bug: 204001941
Test: internal
Change-Id: I19c73356cc305ec7a6dfd3bddbde775ef9ca4953
2021-10-27 10:56:47 -07:00
Sasha Smundak
6d852dd16a Implement include path annotation.
Include top annotation is a specially formatted comment line providing
the include/inhherit file location hint. E.g., adding
```
```
before
```
$(call inherit-product $(SRC)/foo.mk
```
is a hint to the converter to look for the `foo.mk` files under
`vendor/my_vendor/` in addition to `vendor/google_devices/'

Bug: 193566316
Test: internal
Change-Id: I01c5dde2504f1a9eb724098b1cc03d2176ca2cf9
2021-10-27 10:56:47 -07:00
Sasha Smundak
65b547edc2 Better Soong config namespace support.
Old macros (`add_soong_config/namespace` & `add_soong_config_var_value`) are
going away, to be replaced with `soong_config_set`. A new macro,
`soong_config_append` is added to append to the existing value.
Also, flag the attempts to reference the values of the variables in the
Soong config namespace.

Bug: 200297238
Test: internal
Change-Id: Idb6a31632db75d7faef038b83e6a86d9dcf1e736
2021-10-27 10:56:46 -07:00
Liz Kammer
1556173806 Merge "bp2build: Handle export_generated_header property" am: cc910df597 am: 3c2c46f492
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1863256

Change-Id: I407886d18afd455b919c785a97df09de69e32ca0
2021-10-27 15:51:07 +00:00
Liz Kammer
3c2c46f492 Merge "bp2build: Handle export_generated_header property" am: cc910df597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1863256

Change-Id: I966870b7fd0ec5bfbf7ec0da324dfb1dd401af91
2021-10-27 15:32:35 +00:00
Liz Kammer
cc910df597 Merge "bp2build: Handle export_generated_header property" 2021-10-27 15:07:03 +00:00
Steven Moreland
83bb70d062 Merge "Add health to vndk vendor variant list" am: bc909df732 am: 62dc52bb85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557255

Change-Id: I6956a00e91c6982e74ccc54373d8641ee9fcbec0
2021-10-26 23:15:19 +00:00
Steven Moreland
62dc52bb85 Merge "Add health to vndk vendor variant list" am: bc909df732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557255

Change-Id: Iaa5c1f51fdf20fa0034c3089d17319d37126f8d8
2021-10-26 22:55:45 +00:00
Steven Moreland
bc909df732 Merge "Add health to vndk vendor variant list" 2021-10-26 22:33:31 +00:00
Nick Desaulniers
e6ee25a2df remove support for *.mc files am: dc24d26093 am: 5e884723e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870523

Change-Id: I12eb30d1b691cab582a4387f08ff43216189b4ec
2021-10-26 21:20:47 +00:00
Nick Desaulniers
0e50b37e2b remove support for *.rc files am: 16bc50a128 am: 4e56d1ff60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870522

Change-Id: I6a684723452a2b694d13ba591549a86c128df2d4
2021-10-26 21:20:46 +00:00
Nick Desaulniers
5e884723e3 remove support for *.mc files am: dc24d26093
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870523

Change-Id: I81f56be188889aba3aab1d26abdbd5edfb039c9b
2021-10-26 20:59:14 +00:00
Nick Desaulniers
4e56d1ff60 remove support for *.rc files am: 16bc50a128
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870522

Change-Id: I465dfb1a9585b3ad9aebaa56c436d8c38c3a76d3
2021-10-26 20:59:04 +00:00
Liz Kammer
e6583482a8 bp2build: Handle export_generated_header property
The generated_header property resides in BaseCompilerProperties, while
export_generated_header resides in BaseLinkerProperties. Previously
bp2build handled these property structs separately; however, these two
related properties residing in separate structs requires restructuring
the code to allow access to both BaseCompilerProperties and
BaseLinkerProperties for a single axis/configuration combination to
resolve which generated headers are exported/not for the
axis/configuration..

Test: go test soong tests
Test: build/bazel/ci/bp2build.sh
Change-Id: Id150003637fd19d87e8dc5d6941e9f36dc4031dd
2021-10-26 15:10:41 -04:00
Jooyung Han
09c11adf51 apex.custom_sign_tool property
A new property indicates a CLI tool to sign the APEX contents. The value
is stored in apexkeys.txt so that releasetool (sign_target_files_apks)
can use it to invoke the tool to re-sign the apex contents.

Bug: 193504286
Test: m out/soong/apexkeys.txt
      com.android.virt.apex line has sign_tool value
Change-Id: Ifd472049b75b5b87c1ed320f5e1190ff65ed54f2
2021-10-27 04:02:48 +09:00
Nick Desaulniers
dc24d26093 remove support for *.mc files
We've also removed the last consumer of .mc files in aosp/1867048
(external/mdnsresponder/).

Bug: 203794880
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I2883a04d04b099273261d76319261d0857aa0300
2021-10-26 11:38:37 -07:00
Nick Desaulniers
16bc50a128 remove support for *.rc files
We're now packaging llvm-windres (aosp/1870074) which can be used as a
substitute for GNU binutils' windres, but we've also removed the last
consumer of .rc files in aosp/1867048 (external/mdnsresponder/).

In the worst case, we can bring back support for .rc files but instead
process them with llvm-windres.

Bug: 203794880
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: I30a873537e004b46a87191a932d076a89463c873
2021-10-26 11:32:36 -07:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
6a4a66387d Merge "Remove vestigial GetPrebuiltCcStaticLibraryFiles" am: 68f309abf9 am: 360cf390a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1864754

Change-Id: I80bcd25422394f4a143bc31b598847aa4814e686
2021-10-26 17:29:41 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
360cf390a3 Merge "Remove vestigial GetPrebuiltCcStaticLibraryFiles" am: 68f309abf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1864754

Change-Id: Ie14c7854c96e555be7c317f837eba03d3266ace3
2021-10-26 17:15:09 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
68f309abf9 Merge "Remove vestigial GetPrebuiltCcStaticLibraryFiles" 2021-10-26 17:00:29 +00:00
Treehugger Robot
a4e3dda117 Merge "[rust] Switch LTO flavor to "thin"" am: e852d69f88 am: f9a94d552f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869695

Change-Id: I5f1b36e22d1505ff6da1f2ee670b5f5564375945
2021-10-26 16:18:54 +00:00