Commit Graph

5959 Commits

Author SHA1 Message Date
Jose "Pepe" Galmes
7e21d3cd04 Merge "Fix duplicate variations when using the VSDK." 2021-06-02 03:31:07 +00:00
Elliott Hughes
e51f891c43 Merge "Rename gccCmd mingwCmd now that's all it's used for." am: 2a8b0530fa am: 1b9fa5d148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710949

Change-Id: Ic033240e074fbe92cfa325026bad4de39cb66b9d
2021-06-01 22:27:17 +00:00
Treehugger Robot
7577a2d094 Merge "Remove versioned LLNDK stubs" am: ebdf61ece2 am: db246b5784
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698870

Change-Id: Ieed2cc19c37d477d5f90c2e42a901e90e7d748c9
2021-06-01 22:27:07 +00:00
Elliott Hughes
2a8b0530fa Merge "Rename gccCmd mingwCmd now that's all it's used for." 2021-06-01 21:40:16 +00:00
Treehugger Robot
ebdf61ece2 Merge "Remove versioned LLNDK stubs" 2021-06-01 18:38:52 +00:00
Colin Cross
f58e5e8f24 Merge "Don't propagate ASAN through shared library dependencies" into sc-dev 2021-06-01 17:24:09 +00:00
Treehugger Robot
9c9c8e0055 Merge "Handle product vars *flags props in cc* modules" am: 72aedde483 am: 88a66219af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1719330

Change-Id: Ib995b400969601b5a803a56c14d903a81165dd68
2021-05-31 09:12:16 +00:00
Treehugger Robot
72aedde483 Merge "Handle product vars *flags props in cc* modules" 2021-05-31 08:21:19 +00:00
Rupert Shuttleworth
6981ce9f8c Add cc_prebuilt_library helpers for use by the llvm_prebuilt_library_static converter. am: ffd4582b86 am: ecedf43e7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1712168

Change-Id: I70641ce38a2cbde196dc9418c2a348521c86a6c6
2021-05-27 20:47:53 +00:00
Colin Cross
58b783b460 Remove unused cc.copyDirectlyInAnyApexDependencyTag
Bug: 183759446
Test: go test ./build/soong/cc
Change-Id: I967f5c42cbf7722843a6455cbc2867a8912033cb
Merged-In: I967f5c42cbf7722843a6455cbc2867a8912033cb
(cherry picked from commit 243f3c250e)
2021-05-27 13:13:17 -07:00
Liz Kammer
ba7a9c5e4a Handle product vars *flags props in cc* modules
Test: build/bazel/ci/bp2build.sh
Bug: 188497994
Change-Id: Ifb379e370075d6a7bc55b82d79c210c31ef377e9
2021-05-27 13:57:01 -04:00
Jose Galmes
7fdc336b9f Fix duplicate variations when using the VSDK.
When using the VSDK there can be multiple variations of the same module
for core, product, vendor, recovery. If two or more of those variations
exist, a suffix must be added to the variation to avoid duplicate modules
with the same name.

Bug: 188717568
Test: m -j nothing
Change-Id: Ifd8fa5590a8e225a97c2a8e3110d5d5f20beb50d
2021-05-27 10:16:24 -07:00
Liz Kammer
d2f186a6ba Merge "Support empty srcs for configurable attrs" am: f6840284b6 am: 4fb2bdffee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1720031

Change-Id: I84ddfb65ec4c03cb3e246e2eba1c772e93ff73d2
2021-05-27 13:42:10 +00:00
Rupert Shuttleworth
ffd4582b86 Add cc_prebuilt_library helpers for use by the llvm_prebuilt_library_static converter.
Test: bazel build //prebuilts/clang/host/linux-x86:prebuilt_libFuzzer
Test: bazel build //prebuilts/clang/host/linux-x86:prebuilt_libomp
Test: bazel build //prebuilts/clang/host/linux-x86:prebuilt_libunwind
Test: bazel build //prebuilts/clang/host/linux-x86:prebuilt_libunwind-exported

Change-Id: I9343e19a149b62785e8ee3096254776c19675032
2021-05-27 09:07:57 -04:00
Liz Kammer
f6840284b6 Merge "Support empty srcs for configurable attrs" 2021-05-27 12:56:29 +00:00
Rupert Shuttleworth
eac63304a3 Merge "Add e.g. Target: { Android_arm: { ...} } support to LabelAttribute." am: 1b1ab6d7ab am: aff15276c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1720610

Change-Id: I48ba8df066f843eb011e5a89580937dbda907b1b
2021-05-27 10:14:45 +00:00
Rupert Shuttleworth
22cd2eb3d1 Add e.g. Target: { Android_arm: { ...} } support to LabelAttribute.
LabelListAttribute support was already added, but LabelAttribute support is needed for cc_import rules.

Test: Added unit test for version_script, which is the only supported LabelAttribute so far.

Change-Id: I4e86e7391586e0780623d06b794e7399f0ccd50e
2021-05-27 04:32:48 -04:00
Colin Cross
532e863da0 Merge changes I0116f5f4,I950c9b54,I967f5c42 am: 4ab2dd1afe am: 7ca753793f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1718475

Change-Id: I864c97d90aa8f2ec4e43ac9d39464ca257b608e2
2021-05-27 01:38:25 +00:00
Colin Cross
4ab2dd1afe Merge changes I0116f5f4,I950c9b54,I967f5c42
* changes:
  Treat java libraries in classpath fragments as directly in apex
  Make CopyDirectlyInAnyApex match the documentation
  Remove unused cc.copyDirectlyInAnyApexDependencyTag
2021-05-27 00:56:52 +00:00
Jose "Pepe" Galmes
e86a06a451 Merge "Fix change in logic introduced in https://r.android.com/1666563." am: 581dc930b2 am: ebf6fd1ca9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1718372

Change-Id: I25a3582c590c632cc6d05be882805c8832ba1a47
2021-05-26 21:43:16 +00:00
Jose "Pepe" Galmes
581dc930b2 Merge "Fix change in logic introduced in https://r.android.com/1666563." 2021-05-26 21:09:05 +00:00
Liz Kammer
2b07ec7b3b Support empty srcs for configurable attrs
Test: mixed build linkerconfig
Change-Id: I1ee56f7fa46ce2971ecae6d2ca9258631a32f46a
2021-05-26 16:58:54 -04:00
Jingwen Chen
ca21ea8f5a bp2build: support arch/target static/shared props. am: bcf5304eab am: ba0ed994cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1717437

Change-Id: Ibb05177835e7af688e27efb340acc78d4d0a2d68
2021-05-26 11:26:30 +00:00
Jiyong Park
d9a8119018 Merge "Update VndkMustUseVendorVariantList after aidl-freeze-api" into sc-dev am: 59fa1e4b7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14703270

Change-Id: Ie942339e4d9c98bfdf9f43d0912313b71c797417
2021-05-26 11:24:03 +00:00
Jingwen Chen
bcf5304eab bp2build: support arch/target static/shared props.
This CL adds the support for static/shared cc_library props nested
within target and arch structs, and correctly sets them in the right
select statement.

Test: TH
Bug: 189183307
Change-Id: I48f7d62755ebab56fe03d3ecee2e15427eb552c9
2021-05-26 09:28:19 +00:00
Rupert Shuttleworth
e33da475f9 Make GetTargetProperties() aware of more complex targets, like 'android_arm', instead of just 'android'. am: c194ffbcf3 am: 42b29a5b40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1712089

Change-Id: I2a68455e55701c2251d61a0db6855c34879fea93
2021-05-26 05:13:18 +00:00
Jose Galmes
737d0a1f84 Fix change in logic introduced in https://r.android.com/1666563.
https://r.android.com/c/platform/build/soong/+/1666563/3/cc/image.go#551
introduced a change in logic.

Bug: 188717568

Test: source build/envsetup.sh
Test: m -j nothing
Change-Id: Iab27f1c3ca1a488d074f9c5c61fe071d7d445b91
2021-05-25 22:06:41 -07:00
Colin Cross
243f3c250e Remove unused cc.copyDirectlyInAnyApexDependencyTag
Bug: 183759446
Test: go test ./build/soong/cc
Change-Id: I967f5c42cbf7722843a6455cbc2867a8912033cb
2021-05-25 18:28:38 -07:00
Rupert Shuttleworth
c194ffbcf3 Make GetTargetProperties() aware of more complex targets, like 'android_arm', instead of just 'android'.
Test: Added new unit test and updated existing tests.

Test: bazel build //bionic/... //external/... //frameworks/... //system/...

Test: ./build/bazel/scripts/run_presubmits.sh

Change-Id: I250d1964f5cf42b92ddb929379d35d8c844423f7
2021-05-25 19:40:16 -04:00
Jiyong Park
59fa1e4b7f Merge "Update VndkMustUseVendorVariantList after aidl-freeze-api" into sc-dev 2021-05-25 22:43:41 +00:00
Christopher Parsons
c311686ec6 Merge "Rollforward "Split asm and c flags and srcs in..."" am: e28a176a99 am: 47e19b1774
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1717990

Change-Id: Ia0ad960d0339fdfc308d63c8b77b7fad000d111d
2021-05-25 19:52:24 +00:00
Christopher Parsons
e28a176a99 Merge "Rollforward "Split asm and c flags and srcs in..."" 2021-05-25 18:59:39 +00:00
Liz Kammer
5e45e44281 Merge "Combine bp2build handling of static/shared props" am: 3169bca9e2 am: bc90e7a101
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1715719

Change-Id: I8518f285f18bcabea6f26cfea968cec5afccf75f
2021-05-25 17:19:33 +00:00
Liz Kammer
3169bca9e2 Merge "Combine bp2build handling of static/shared props" 2021-05-25 16:55:02 +00:00
Chris Parsons
990c4f4fc3 Rollforward "Split asm and c flags and srcs in..."
This fixes a test and rolls forward I28cf7437ee96cdf2fdbcb1eda2303691cff08ba4

Test: m nothing
Test: See I28cf7437ee96cdf2fdbcb1eda2303691cff08ba4
Change-Id: I0e450c28e70087e406e7b562d7e772785f177379
2021-05-25 12:15:52 -04:00
Colin Cross
cba30f8e8a Merge "Revert "Split asm and c flags and srcs in bp2build output"" am: 4f9d8d6482 am: 093a04ee0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1717890

Change-Id: I132d4470234905227d5c8172914a7eaa141bbe45
2021-05-25 16:12:56 +00:00
Christopher Parsons
15f4842622 Merge "Split asm and c flags and srcs in bp2build output" am: ed73b76513 am: 9f4133b1a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714835

Change-Id: I6d55ca20c08fec94f0f0454d13394acf8ff3c13d
2021-05-25 15:40:33 +00:00
Colin Cross
4f9d8d6482 Merge "Revert "Split asm and c flags and srcs in bp2build output"" 2021-05-25 15:21:36 +00:00
Colin Cross
52aa4e1fd4 Revert "Split asm and c flags and srcs in bp2build output"
Revert submission 1714835-roboleaf-asm-c

Reason for revert: TestCcLibraryStaticProductVariableSelects fails everywhere
Reverted Changes:
I28cf7437e:Split asm and c flags and srcs in bp2build output
I2b47e6b55:Split libraries by language in cc_library_static

Change-Id: I85d39a462f0a5b3f5ff3d685906813fab9f01358
2021-05-25 15:20:39 +00:00
Christopher Parsons
ed73b76513 Merge "Split asm and c flags and srcs in bp2build output" 2021-05-25 14:58:32 +00:00
Liz Kammer
2222c6bb42 Combine bp2build handling of static/shared props
Test: go test soong tests
Change-Id: I793f88bcbad2cdee042c6b2d17104e9ca03602b9
2021-05-25 08:28:43 -04:00
Justin Yun
c6cdef06dc Merge "Do not filter LLNDK lib from llndk.libraries.txt" am: 708984efbe am: 31353efea4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1716574

Change-Id: I8ea965904c83cde39ea7b8c4638b9316e9569ac2
2021-05-25 05:10:59 +00:00
Justin Yun
acd459728a Do not filter LLNDK lib from llndk.libraries.txt
llndk.libraries.txt is used to list the LLNDKs for the linkerconfig.
This is also required to define the VNDK snapshot modules of LLNDK
stub libraries.
The list had a filter for hwasan libraries, but the filter must be
used only for the LLNDK_LIBRARIES make variable, but not for the
llndk.libraries.txt file.

Bug: 189070366
Bug: 188716508
Test: m nothing
Test: LLNDK_LIBRARIES in make_vars-*.mk does not include hwasan.
Change-Id: I820dd1161892dc76700aa1d696ea2643764d2052
Merged-In: I820dd1161892dc76700aa1d696ea2643764d2052
(cherry picked from commit 611e886ca7)
2021-05-25 13:29:48 +09:00
Justin Yun
708984efbe Merge "Do not filter LLNDK lib from llndk.libraries.txt" 2021-05-25 04:21:54 +00:00
Chris Parsons
af24cdd99f Split asm and c flags and srcs in bp2build output
This allows removal of almost all current items from the mixed build
denylist, which were previously broken due to being unable to separately
control flags for compilations of different languages within the same
target.

Note that this does not appropriately implement asm/c srcs and flags for
either the shared variant or the static variant. This will require a
followup.

Test: bp2build.sh and mixed_libc.sh CI scripts
Test: Updated b2build tests

Change-Id: I28cf7437ee96cdf2fdbcb1eda2303691cff08ba4
2021-05-24 21:49:14 -04:00
Treehugger Robot
b507c380d2 Merge "Handle product config vars in bp2build." am: d01a80869d am: c62327ebf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698529

Change-Id: Iba303087148c275c227a4cfc98296011f5bcb84c
2021-05-24 22:58:43 +00:00
Liz Kammer
6fd7b3fee9 Handle product config vars in bp2build.
Test: bp2build ci  & mixed build libc
Bug: 183595873
Change-Id: I2d87434ff4df5a24efc5e3e38f087de035228934
2021-05-24 14:22:31 -04:00
Jiyong Park
c110a43b92 Update VndkMustUseVendorVariantList after aidl-freeze-api
Bug: 188713899
Test: m
Change-Id: Ib1287208a1c6cfc40e4c01617b64ce05c6c88f6e
2021-05-24 23:51:19 +09:00
Justin Yun
611e886ca7 Do not filter LLNDK lib from llndk.libraries.txt
llndk.libraries.txt is used to list the LLNDKs for the linkerconfig.
This is also required to define the VNDK snapshot modules of LLNDK
stub libraries.
The list had a filter for hwasan libraries, but the filter must be
used only for the LLNDK_LIBRARIES make variable, but not for the
llndk.libraries.txt file.

Bug: 189070366
Bug: 188716508
Test: m nothing
Test: LLNDK_LIBRARIES in make_vars-*.mk does not include hwasan.
Change-Id: I820dd1161892dc76700aa1d696ea2643764d2052
2021-05-24 20:44:44 +09:00
Christopher Parsons
5fa630590e Merge "Propagate unexported deps via implementation_deps" am: dbfafc0a3c am: 5166c5a9b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1711041

Change-Id: I076d42f013a4554178c7d5660744dea0773381b9
2021-05-22 19:27:53 +00:00