Commit Graph

32896 Commits

Author SHA1 Message Date
Treehugger Robot
a9ed2e4658 Merge "Remove libbinder_headers from apex_available allowlist" am: b02128ad0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b560517bc1ab39b42204df956f7146c424bfa9a
2021-02-06 03:56:07 +00:00
Treehugger Robot
b02128ad0b Merge "Remove libbinder_headers from apex_available allowlist" 2021-02-06 03:20:47 +00:00
Jooyung Han
1a90279656 Merge "cc: fix version macro for stubs" am: 7701309889
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f39d3222e5de4b8bd6b825f31aa107ddaa1836e
2021-02-06 02:08:05 +00:00
Jooyung Han
7701309889 Merge "cc: fix version macro for stubs" 2021-02-06 01:41:31 +00:00
Colin Cross
d1ee209fb0 Merge "soong_zip: don't glob RSP file entries" am: d685adb245
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1573781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic99b0a580edf61aaa52a0ed5d7707ba4134f347e
2021-02-05 21:54:46 +00:00
Colin Cross
d685adb245 Merge "soong_zip: don't glob RSP file entries" 2021-02-05 21:33:37 +00:00
Jose "Pepe" Galmes
504904f063 Merge "Generate fake versions of modules excluded in directed vendor snapshot." am: c64b961708
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1572856

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3ad7ace5e1854d414afe130ba66b83158c63d2
2021-02-05 18:28:41 +00:00
Jose "Pepe" Galmes
c64b961708 Merge "Generate fake versions of modules excluded in directed vendor snapshot." 2021-02-05 17:54:48 +00:00
Jose Galmes
0a942a0368 Generate fake versions of modules excluded in directed vendor snapshot.
When using the directed vendor snapshot, the build fails because soong
fails to find some variants of the modules that have been excluded
from VENDOR_SNAPSHOT_MODULES, even though those modules are not going
to be used by the build.

The solution implemented here is to generate fake versions of those
modules (empty files) and include them in the generated Android.bp,
so that soong finds the modules, even though trying to use them would
fail.

Bug: 171821997
Bug: 179275601

Test: source build/envsetup.sh
Test: m -j nothing

Change-Id: Ibd3e963ab3e5504c0ac817f7cabbd241bf47a5cb
2021-02-05 17:53:53 +00:00
Treehugger Robot
3a0d57aed2 Merge "Support uncompressed cpio" am: b3f9025b6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9b83f762da05960434ee47834ae2409be705688
2021-02-05 16:21:40 +00:00
Ivan Lozano
cbf766a1d2 Merge "rust: Pass cc static libs to rustc." am: 729d5cf097
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1575463

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I695cc2b0b7277b4e36cb46b329e5480f4163f034
2021-02-05 16:20:55 +00:00
Treehugger Robot
b3f9025b6e Merge "Support uncompressed cpio" 2021-02-05 15:57:22 +00:00
Ivan Lozano
729d5cf097 Merge "rust: Pass cc static libs to rustc." 2021-02-05 15:53:33 +00:00
Liz Kammer
6d5454d0f9 Merge "bp2build: convert paths/module refs to Bazel label" am: b7eab01167
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564272

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93935a595e2e1aee7de1deb7c19e9da266fcd43e
2021-02-05 14:20:39 +00:00
Liz Kammer
b7eab01167 Merge "bp2build: convert paths/module refs to Bazel label" 2021-02-05 13:39:08 +00:00
Treehugger Robot
5e9e281869 Merge "bp2build: fix BUILD file generation incrementality bug." am: b89336487e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1577063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8eb81bf4478cc838366bbe682ab264f47f8bfe8
2021-02-05 12:50:00 +00:00
Treehugger Robot
b89336487e Merge "bp2build: fix BUILD file generation incrementality bug." 2021-02-05 12:05:57 +00:00
Ulyana Trafimovich
1fdefc2c57 Merge "Don't write nonexistent DEX file paths to dexpreopt.config files." am: 9b91082452
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72e7597502285e53dd9085e0f4e7b955cf26143e
2021-02-05 11:51:24 +00:00
Ulyana Trafimovich
9b91082452 Merge "Don't write nonexistent DEX file paths to dexpreopt.config files." 2021-02-05 11:10:03 +00:00
Paul Duffin
6664c04ce9 Merge "Detect empty apex in ConfiguredJarList" am: b8887127ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574743

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d95828294a1b89b985a13a61b8539c7256d06b8
2021-02-05 10:18:45 +00:00
Paul Duffin
b8887127ba Merge "Detect empty apex in ConfiguredJarList" 2021-02-05 09:30:15 +00:00
Yan Yan
18aa1bd39c Merge "Change IKE min_sdk to 30" am: 3a5c0af0fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1573465

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89454634adc77fc2158992cc42d3ee34d99b85ff
2021-02-05 07:53:51 +00:00
Yan Yan
3a5c0af0fb Merge "Change IKE min_sdk to 30" 2021-02-05 07:33:56 +00:00
Jingwen Chen
7dcc4fcc68 bp2build: fix BUILD file generation incrementality bug.
Before this change, changes to any Android.bp file would not trigger a re-run of bp2build/Soong, since the depfile for Soong's main output, the build.ninja file, didn't contain the list of Android.bp files. bp2build only reran when Soong itself changed, which happens regularly while developing bp2build, but not at all while modifying Android.bp files.

This change correctly dumps the list of all Android.bp files in the tree to the depfile for out/soong/build.ninja, therefore correctly triggering a re-run of bp2build when any Android.bp file changes.

Test: GENERATE_BAZEL_FILES=true m nothing; edit an Android.bp file; GENERATE_BAZEL_FILES=true m nothing -> successfully re-runs and regenerates out/soong/bp2build.

Test: inspect out/soong/build.ninja.d manually
Fixes: 179452534

Change-Id: Iad80c381b3afa38a4d4fafca035e46aa2a1f206a
2021-02-05 01:33:47 -05:00
Jooyung Han
59d0931de7 Remove libbinder_headers from apex_available allowlist
libbinder_headers now sets apex_available property.

Bug: 150999716
Test: m
Change-Id: If58cfeafcc13fc36be8e44a66f2f472460fd4c8d
2021-02-05 15:32:40 +09:00
Treehugger Robot
685daa0dd9 Merge "data dependency of java_test_host can be arch-specific" am: f860a2ab66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I804ea867688f5a0e8600e37ad8ee5e283c460355
2021-02-05 04:36:21 +00:00
Treehugger Robot
f0cdd375ad Merge changes I6a5357e9,I199f070e am: 364da36115
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id50f6a4d03a7f740e9815d5b6fd1d1df5ff66dca
2021-02-05 04:34:53 +00:00
Treehugger Robot
7ca0af1e40 Merge "New header lib added to apex/allowed_deps.txt" am: 87bd0f3c22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9e38a7868b6d42a04d23811148cb90cc950f395
2021-02-05 04:34:02 +00:00
Treehugger Robot
f860a2ab66 Merge "data dependency of java_test_host can be arch-specific" 2021-02-05 04:15:42 +00:00
Treehugger Robot
364da36115 Merge changes I6a5357e9,I199f070e
* changes:
  Install ko to /lib/modules
  android_filesystem is OutputFileProducer
2021-02-05 03:39:51 +00:00
Treehugger Robot
87bd0f3c22 Merge "New header lib added to apex/allowed_deps.txt" 2021-02-05 03:34:48 +00:00
Treehugger Robot
25d6900bb7 Merge "clean up some hard-coded min_sdk_version" am: d0347e4d32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40798e32632e17f92ab6afdda72eb2bf188cb923
2021-02-05 03:03:15 +00:00
Treehugger Robot
d0347e4d32 Merge "clean up some hard-coded min_sdk_version" 2021-02-05 02:54:43 +00:00
Treehugger Robot
5ac8cddcda Merge "Add file_contexts property to filesystem" am: 2ad91929d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1571700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7319f70789d12d002da8255f7fbb449e2a17545c
2021-02-05 02:50:07 +00:00
Treehugger Robot
4cc87fe37b Merge changes I904b4374,I6b4ea062 am: 4f67b03e8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1571886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b7149c0c5d6788ebdf03c80aa39a1188c6d89ca
2021-02-05 02:49:26 +00:00
Jooyung Han
11b0fbdbf6 cc: fix version macro for stubs
When a cc module is built against a stub, compiler passes version macro
of the stub lib. Version macro should be numeric, so codenames or
"current" should be mapped to numbers just like how ndkstubgen maps to.

* "current" -> future (10000)
* codenames -> look up api_level.json
* otherwise -> cast to int

Bug: 179329813
Test: m / soong test / manually check the output build.ninja
Change-Id: Ic0e1dd904984e161694a0b77fad5559c06a4462f
2021-02-05 11:27:57 +09:00
Treehugger Robot
2ad91929d2 Merge "Add file_contexts property to filesystem" 2021-02-05 02:03:52 +00:00
Treehugger Robot
4f67b03e8b Merge changes I904b4374,I6b4ea062
* changes:
  Do not add '.product' suffix for product_specific module
  Use target dependent module to update the name suffix
2021-02-05 01:52:04 +00:00
Chih-hung Hsieh
7bca661e9a Merge "Disable gnu-folding-constant warning." am: adeb44b112
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1573787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide350d35ad29608959d9ee4528f81412befac207
2021-02-05 00:26:23 +00:00
Chih-hung Hsieh
adeb44b112 Merge "Disable gnu-folding-constant warning." 2021-02-04 23:59:27 +00:00
Ivan Lozano
3dfa12db6c rust: Pass cc static libs to rustc.
Pass static libraries to rustc via the "-lstatic" flag so that rustc can
reason how to handle these libraries. This means that these static
libraries get bundled into rlibs, reducing the need to redeclare these
dependencies in dependent modules.

Additionally, exported depFlags were never used anywhere, so remove this
from flagExporter.

Bug: 175886967
Bug: 179122837
Test: m
Test: Checked that static symbols aren't duplicated in a resulting
      binary when it appears in a dependency graph more than once.
Change-Id: Ifeb3c384e4fad8704206997242a0156ddcb87d2c
2021-02-04 16:29:02 -05:00
Chih-Hung Hsieh
72e88767dc Disable gnu-folding-constant warning.
New clang compiler issue too many such warnings.

Bug: 179065588
Bug: 179309338
Bug: 179278370
Test: make, presubmit
Change-Id: I9948a4b34ec75a01aa24c2fd753722b072ae5202
2021-02-04 11:46:40 -08:00
Liz Kammer
356f7d45c1 bp2build: convert paths/module refs to Bazel label
This currently expands all globs, still need to support converting glob
syntax.

Test: go build_conversion_test
Test: GENERATE_BAZEL_FILES=true m nothing
Test: m nothing
Bug: 165114590
Change-Id: If7b26e8e663d17566fad9614ca87a8da1f095284
2021-02-04 13:45:56 -05:00
Jiyong Park
837cdb2212 Support uncompressed cpio
Bug: 178978059
Test: atest VirtualizationHostTestCases
Change-Id: I1f69af40f10d14ec2f3de6111d12b3a9c5d6c75c
2021-02-05 00:29:47 +09:00
Jiyong Park
cdd9b8392d data dependency of java_test_host can be arch-specific
This allows java_test_host to have arch-specific data files. Currently,
VirtualizationHostTestCases needs this to have arch-specific kernels as
its data.

Bug: N/A
Test: m VirtualizationHostTestCases
Change-Id: Ib5680ef48b613955ad92c9bc212184ac75900d3e
2021-02-05 00:29:47 +09:00
Jiyong Park
599992bc3e Install ko to /lib/modules
... not to /lib/module

Bug: 178980227
Test: m
Change-Id: I6a5357e9e83e736181b885b64c76e0b7e5ffadf2
2021-02-05 00:29:47 +09:00
Jiyong Park
940dfd4db2 android_filesystem is OutputFileProducer
... to be able to reference the module in data property of test modules.

Bug: N/A
Test: m VirtualizationHostTestCases
Change-Id: I199f070e811011cea6189ef24c0b2d8a683f79d0
2021-02-05 00:29:47 +09:00
Ulya Trafimovich
c0f64799da Don't write nonexistent DEX file paths to dexpreopt.config files.
A path to an nonexistent file caused dex2oat to write an empty path in
the class loader context stored inside of the OAT/ODEX file, which
resulted in class loader context mistmatch and a failure to load
dexpreopt code on device.

An example of a faulty class loader context for GoogleDialer, can be
seen either with oatdump or by grepping logcat for class loader context
mimatch messages (the first empty PCL[] is expected, note the second
empty PCL[] in the subcontext for shared libraries):

  PCL[]{PCL[]#PCL[/system/framework/org.apache.http.legacy.jar*22205474]

This CL removes the nonexistent path from the generated dexpreopt.config
file, which works in conjunction with a change in makefiles that stops
using the removed config field. This is possible because makefiles can
access DEX files using a module name and "intermediates-dir-for" macro.

Bug: 132357300
Test: lunch 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: I8d16f77c6f76ad6234cc4114ad3545cbe572ef13
2021-02-04 12:14:51 +00:00
Paul Duffin
9c3ac96f1f Detect empty apex in ConfiguredJarList
Previously, ConfiguredJarList would accept an empty apex name,
e.g. ":jar" which makes no sense as every apex has to have a non-empty
name. This change makes an empty apex invalid.

In order to improve the test coverage of the TestConfiguredJarList test
this change also changes the implementation of
CreateTestConfiguredJarList([]string) to marshal the supplied strings
into a json list and then unmarshal into a ConfiguredJarList which more
closely matches how it is used at runtime.

Bug: 178361284
Test: m nothing
Change-Id: I7dfec6b4cc1923aa99746e976da0393922ef0791
2021-02-04 10:07:41 +00:00
Inseob Kim
b8c9ba16d6 Merge "Allow common arch for recovery" am: 53b2427fc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1569361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib738482856430e89e3823d59b5a13e83af3d3fe7
2021-02-04 06:55:08 +00:00