Commit Graph

6123 Commits

Author SHA1 Message Date
Paul Duffin
d23c726b36 Add RemoveOptionalPrebuiltPrefix() helper function
Test: m nothing
Bug: 171061220
Change-Id: Iaca95efcaf3f02e066751c6e988d609ac40e048a
2020-12-11 18:13:08 +00:00
Pirama Arumuga Nainar
d36c83862f Merge "[coverage] Wrap calls to open" 2020-12-11 17:42:09 +00:00
Ivan Lozano
05e4f9f535 Merge "Refactor for preliminary Rust vendor image support" am: f48c89cd39 am: f0da84ce8e am: ebb9cb3fe7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I342bd25e0b164ed95f78b522c91335faa9592f40
2020-12-11 14:47:43 +00:00
Ivan Lozano
f48c89cd39 Merge "Refactor for preliminary Rust vendor image support" 2020-12-11 13:40:20 +00:00
Jiyong Park
75a7ca7955 Merge "stub variants also re-exports headers" am: 6f05a73e3e am: 0c6aecfa06 am: 4d4fce3df8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1ca06edc0f0f3f58951f037696f446c8c350549
2020-12-11 10:09:00 +00:00
Jiyong Park
6f05a73e3e Merge "stub variants also re-exports headers" 2020-12-11 08:50:12 +00:00
Jiyong Park
1ad8e16fbe stub variants also re-exports headers
This change fixes a bug that headers are not re-exported from stub
variants of a library, if the headers are not from header libs, but from
shared or static libs. This is because only header lib dependencies
are respected for stubs variants.

The fix is as follows. 1) dependencies to the shared/static libs are
added even for stubs variants. 2) instead, in depsToPaths, they are
treated like header libs (i.e. don't contribute to linkFile) for the
stubs variants.

Bug: 174558745
Test: m

Change-Id: Iab6c77e7817055d0f2d09cb114186b30164fc231
2020-12-11 13:48:28 +09:00
Treehugger Robot
4a6181a4f4 Merge "Add some comments for VNDK / vendor snapshots" am: b0ed5768d3 am: 8d70093762 am: 0cfc6b8fbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85fb2e97c8c8bd8778de852a0b61b2c095b4cf52
2020-12-11 01:43:26 +00:00
Jiyong Park
6535de6429 Merge "Add min_sdk_version to Rust modules." am: 0d399b5915 am: 6b31120281 am: a3df735a37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518205

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03d817a3067f6ca0165b3e1b0593d56397003744
2020-12-11 01:16:42 +00:00
Treehugger Robot
b0ed5768d3 Merge "Add some comments for VNDK / vendor snapshots" 2020-12-11 00:56:47 +00:00
Jiyong Park
0d399b5915 Merge "Add min_sdk_version to Rust modules." 2020-12-10 23:54:34 +00:00
Pirama Arumuga Nainar
9464b6cc6c [coverage] Wrap calls to open
Bug: http://b/173448692

The coverage runtime creates files with uga+rw permissions but an
earlier umask call can restrict these and cause problems with profile
merging ('%Nm' in LLVM_PROFILE_FILE).  This change passes `--wrap,open`
to coverage builds.  The other change in this topic adds the wrapper
function to set the permissions again using `fchmod` (only for files
opened under /data/misc/trace).

Test: Manually validate permissions of files under /data/misc/trace.
Test: libprofile-clang-extras-test
Change-Id: I881474ab184d03d14c5637951aac027a363739b6
2020-12-10 21:45:34 +00:00
Steven Moreland
2057b7f960 Merge "target.apex.exclude_[shared|static]_libs to cc_* modules" am: 35989ae98b am: 2abc02e623 am: 3d8f7f7419
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifab3239fe0c6af2caa8e76a6dbe83bd38458e652
2020-12-10 20:20:39 +00:00
Steven Moreland
35989ae98b Merge "target.apex.exclude_[shared|static]_libs to cc_* modules" 2020-12-10 19:02:02 +00:00
Ivan Lozano
f9e2172aec Refactor for preliminary Rust vendor image support
Refactors parts of CC to prepare for preliminary support for using Rust
static libraries in vendor images. Some previously private functions are
made public, and additional functions are added to LinkableInterface so
GetMakeLinkType can be passed a LinkableInterface.

Bug: 172525289
Test: m
Change-Id: I5fda48e79532fe9ceab255e18d910af58048a123
2020-12-10 10:29:48 -05:00
Inseob Kim
de5744a199 Add some comments for VNDK / vendor snapshots
Also some files are refactored:

- snapshot_prebuilt.go is separated from vendor_snapshot.go. Now
vendor_snapshot.go contains snapshot generation codes, while
snapshot_prebuilt.go contains module definition codes.

- Some helper functions are moved from snapshot_utils.go to util.go.

- Some ambiguous names of types and functions are renamed.

We still can add more detailed comments about the snapshots. They are to
be uploaded in follow-up changes, to avoid making this change too big.

Bug: 173474311
Test: generate vndk and vendor snapshot
Change-Id: I18fa837ccdf44a042b7a78e5c3df25fd2de96d95
2020-12-10 21:12:39 +09:00
Treehugger Robot
333f9b4c39 Merge "Remove AndroidMkExtraFootersFunc entries param." am: cac133df14 am: 528d2fdc51 am: e1ba585449
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I855cb1808bfdf783ae4f16ece7c23bc6bda3f34c
2020-12-10 07:57:46 +00:00
Treehugger Robot
cac133df14 Merge "Remove AndroidMkExtraFootersFunc entries param." 2020-12-10 07:04:02 +00:00
Christopher Parsons
fac27b6833 Merge "Improve comments in cc/library.go and cc/linkable.go." am: 0529cd2d59 am: 87bc821304 am: b5ac71e8fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4544f721dda1c0904d383bf1932c7dfac6b2566f
2020-12-10 03:15:15 +00:00
Christopher Parsons
0529cd2d59 Merge "Improve comments in cc/library.go and cc/linkable.go." 2020-12-10 02:17:58 +00:00
Jiyong Park
13272fbc31 Merge "test_for is available for all cc_* module types" am: 2920d2cec0 am: 2b33ad60aa am: d21fb571b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1517638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84ab5e04cf8af9be6d352a52ea2d2a1a6ca277cf
2020-12-10 01:13:12 +00:00
Jiyong Park
2920d2cec0 Merge "test_for is available for all cc_* module types" 2020-12-10 00:16:29 +00:00
Kalesh Singh
d49e1829e6 Add android.hardware.memtrack-unstable-ndk_platform
Bug: 175021432
Test: Fixes build failure on aosp/1518666
Change-Id: Ic4dd70e2c707c8461f3a591d023555b26197fc14
2020-12-09 19:16:09 -05:00
Ivan Lozano
3e9f9e47cf Add min_sdk_version to Rust modules.
Add the min_sdk_version property to Rust modules so they can declare
a minimum SDK version they support for use with APEX modules.

Test: New Soong test passes.
Bug: 174862583
Change-Id: I2829053a320f50c218783dee5adbeff9cef81e8e
2020-12-09 11:30:44 -05:00
Treehugger Robot
fefa64b629 Merge "Soong: add missing header-abi-dumper inputs" am: 61cb7ed6ff am: bf152250fe am: a28c7a2f37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf50fd6615abbea315896a58d4bbf72529216cac
2020-12-09 08:36:59 +00:00
Treehugger Robot
61cb7ed6ff Merge "Soong: add missing header-abi-dumper inputs" 2020-12-09 07:26:36 +00:00
Jiyong Park
46a512f1f5 test_for is available for all cc_* module types
Sometimes, the ordinary cc_library_* modules need test_for property when
they are part of a bigger cc_test. Instead of propagating the test_for
property from cc_test to its dependencies, this change requires the very
dependency which needs access to the private part of an APEX to
explicitly have the test_for property.

Bug: 161575591
Test: m
Change-Id: Ie1ffe9a60cd2ab02d41bbe5a98225a40392470f6
2020-12-09 12:59:19 +09:00
Jaewoong Jung
02b11a6035 Remove AndroidMkExtraFootersFunc entries param.
I added in case anyone needs to access AndroidMkEntries to generate
footer lines, but nobody uses it, and it only confuses people.

Test: m nothing, TreeHugger
Change-Id: Ic8a450e3c306d9228c1fdec212c7441bd6aaee03
2020-12-07 10:23:54 -08:00
Steven Moreland
1233062860 Merge "vndk.go: remove keymint" am: 252e4c44f1 am: 99d01eab68 am: 1970d8b464
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1514844

Change-Id: I780269d2c530b8c850fd36b5fd9414ebe900b7b3
2020-12-04 20:16:56 +00:00
Colin Cross
0e5cdace56 Merge "Allow stripping host modules" am: 110d13bef3 am: bfbe007c03 am: eb6d616dba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1514992

Change-Id: I2be77ea911deda1795f8ad5c2aa348a0abea3020
2020-12-04 20:16:34 +00:00
Treehugger Robot
50a360aea2 Merge "Add context for invalid extensions for cc compile" am: 0157cc658a am: bf3f99940c am: e471078e1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516958

Change-Id: Ib9bd9c0204980f2b5acebf88a8b745056dec2b64
2020-12-04 19:33:36 +00:00
Steven Moreland
252e4c44f1 Merge "vndk.go: remove keymint" 2020-12-04 19:24:40 +00:00
Colin Cross
110d13bef3 Merge "Allow stripping host modules" 2020-12-04 18:24:13 +00:00
Colin Cross
2254cffd53 Allow stripping host modules
Turn on stripping for host modules if they explicitly request it.

Test: m checkbuild
Change-Id: Ia7c76a278ecacfe8a5bab1631af6c28b8b970999
2020-12-04 09:43:49 -08:00
Treehugger Robot
0157cc658a Merge "Add context for invalid extensions for cc compile" 2020-12-04 17:41:06 +00:00
Liz Kammer
e2861131e6 Add context for invalid extensions for cc compile
Change-Id: I342e8ece56bbe632232d83670d14f9368ed9f0ff
Test: treehugger
2020-12-04 15:19:22 +00:00
Jiyong Park
e386754898 target.apex.exclude_[shared|static]_libs to cc_* modules
The property is used to exclude some shared and static libs when the
module is built for an APEX.

Bug: 166468760
Test: m
Change-Id: I0dcaa4ae94c01aa00dc5539c60d3054c57fd8824
2020-12-04 18:09:39 +09:00
Treehugger Robot
3077db66b8 Merge "Don't use module names with "prebuilt_" prefixes in make dependencies." am: d348c41af5 am: 00fd1c09d5 am: 83d5ddd5eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515504

Change-Id: I26aa94c752c941532290ac69eb6229cbac907c4b
2020-12-04 08:57:50 +00:00
Treehugger Robot
d348c41af5 Merge "Don't use module names with "prebuilt_" prefixes in make dependencies." 2020-12-04 06:23:51 +00:00
Kiyoung Kim
2767c0e4c6 Merge "Add linkerconfig to Runtime APEX" am: 2ba87f466c am: 41e45d90b3 am: aa7703d34b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513630

Change-Id: I4824fbbdc8e53ef1c05a7759a5c9ae8d972f31fb
2020-12-04 03:19:22 +00:00
Treehugger Robot
66524425ff Merge "Rename __ANDROID_SDK_VERSION__." am: fe9e0c775c am: 440ad728a4 am: 19c0e36c53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502112

Change-Id: Ib045f755c203f28610a6ecf13e9335aece662acb
2020-12-04 01:36:20 +00:00
Colin Cross
dbedb52c42 Merge "Pass pctx and ctx to NewRuleBuilder" am: 897a5ad507 am: c5666f9231 am: e4e955818a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500984

Change-Id: I7363070bee2d127e96e15433fc76d3bb2aaf3477
2020-12-04 01:36:00 +00:00
Martin Stjernholm
2856c66c99 Don't use module names with "prebuilt_" prefixes in make dependencies.
The distinction between foo and prebuilt_foo doesn't exist in make, so
this could create invalid dependencies when both source and prebuilt
modules exist and the prebuilts are preferred.

Test: `m` with ART module prebuilts with prefer:true in the tree
Test: m nothing
Bug: 172480615
Change-Id: I90b76a8f38493882b3330d1b6789159852e59d55
2020-12-04 01:00:23 +00:00
Kiyoung Kim
2ba87f466c Merge "Add linkerconfig to Runtime APEX" 2020-12-04 01:00:22 +00:00
Treehugger Robot
fe9e0c775c Merge "Rename __ANDROID_SDK_VERSION__." 2020-12-03 22:09:56 +00:00
Steven Moreland
b9157b152e vndk.go: remove keymint
keymint-unstable is the VNDK variant (and this list is only checked to
be a superset of the desired libraries).

The other library exists, but it is removed because it's not in the VNDK
and this list is only for VNDK libs.

Bug: 173660792
Test: build
Change-Id: I0e1a2a7af13f132cd3bfa4ca1305c098acbe747b
2020-12-03 21:44:14 +00:00
Colin Cross
897a5ad507 Merge "Pass pctx and ctx to NewRuleBuilder" 2020-12-03 20:07:30 +00:00
Christopher Parsons
4d4817ca6f Merge "Add comments to cc/cc.go" am: 47f0e63ba0 am: 8987c1a94a am: 02e222789b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515403

Change-Id: I41039235fad10cf5410ba461ff0f13ac30b36a5d
2020-12-03 18:00:51 +00:00
Christopher Parsons
47f0e63ba0 Merge "Add comments to cc/cc.go" 2020-12-03 16:15:31 +00:00
Inseob Kim
6b16f163b9 Merge "map list files must have newline characters" am: 7ad102164b am: 496ad8c655 am: ba22ad2874
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512738

Change-Id: I8089f986e79d844b81ccbe241424359eb9382514
2020-12-03 01:52:29 +00:00