Commit graph

47013 commits

Author SHA1 Message Date
Liz Kammer
886774204b Don't run SoongBuildInvocation for bp2build + dist
Test: build/bazel/ci/bp2build.sh
Change-Id: I8d24ba437f8af4528ca739feace84e8cfccc5e0b
2021-12-15 15:03:19 -05:00
Liz Kammer
b29852a3da Merge "bp2build: do not convert prebuilt cc binaries" 2021-12-15 15:07:58 +00:00
Martin Stjernholm
12cba52e4f Merge "Remove the compat symlinks to ART binaries." 2021-12-15 10:07:18 +00:00
Jiyong Park
ae9cf26353 Merge changes from topic "canned_fs_config"
* changes:
  Add canned_fs_config to apex module type
  Build canned_fs_config using RuleBuilder
2021-12-15 09:57:42 +00:00
Wei Li
2115d35101 Merge "Add the initial implementation of bp2build converter for java_library, java_library_host, java_binary_host and cc_library_host_shared so signapk tool can be built with Bazel." 2021-12-15 03:39:51 +00:00
Wei Li
bafb6d6612 Add the initial implementation of bp2build converter for java_library,
java_library_host, java_binary_host and cc_library_host_shared so
signapk tool can be built with Bazel.

Test: b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Test: jarsigner -verify -verbose build.bazel.examples.apex.minimal.apex
Bug: 209876137
Bug: 196204358
Bug: 210158864
Bug: 210159074
Bug: 210158872
Change-Id: I855884159d25e69d8f9623792c376da820a1eb4c
2021-12-14 17:23:19 -08:00
Jiyong Park
038e852ce1 Add canned_fs_config to apex module type
The property is used to customize uid/gid/mode/capabilities of files in
an APEX.

Bug: 209971551
Test: m
Change-Id: I484e46ff819a5266c1e8046dae337e18ef3fefea
2021-12-15 09:11:15 +09:00
Jiyong Park
1b0893eeba Build canned_fs_config using RuleBuilder
... in preparation for adding the support for custom canned fs config

Bug: 209971551
Test: m nothing
Change-Id: I7f2576ff99c65bdb6c9ce4ace61bc783eea2f0d4
2021-12-15 09:11:08 +09:00
sophiez
bc82ba55c5 Java used-by API list generation
Update the java used by script to fix the xml format when dexdeps processing resource only APKs

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: I61a58d7c739e74a571e97166a7c9b4091e6f8da0
2021-12-14 14:52:58 -08:00
Christopher Parsons
f793ba068c Merge "Add missing test files to build/soong" 2021-12-14 21:56:26 +00:00
Chris Parsons
1de1d4ee02 Add missing test files to build/soong
Test: m nothing
Change-Id: Icd331f0c2ac09caed0d4f885dd2eb6ec2080b681
2021-12-14 15:25:51 -05:00
Liz Kammer
bdc922f3fe bp2build: do not convert prebuilt cc binaries
These do not have a conversion process yet, do not convert them. Add
more protection against using the wrong conversion for prebuilts in cc.

Test: allowlist project with prebuilt objs/binaries and verify BUILD
      files
Change-Id: Ib26689fa19d6fbb1f5c73ded3b5836165977e987
2021-12-14 14:27:57 -05:00
Liz Kammer
b7d18efca0 Merge "Ensure reported unconverted deps are unique" 2021-12-14 19:10:27 +00:00
Liz Kammer
92344259c5 Merge "Use one mutator for all bp2build conversion." 2021-12-14 19:10:10 +00:00
Martin Stjernholm
0291abca62 Remove the compat symlinks to ART binaries.
App compact impact is hard to judge (see http://b/124106384#comment9
ff), so this tries it early in the dessert cycle.

This is also a workaround for b/209867137 where the symlink install
rules interact badly with the artifact_path_requirements.mk check.

Test: m installclean && m droid
  verify that $(PRODUCT_DIR)/system/bin doesn't have dalvikvm and
  dex2oat symlinks
Bug: 124106384
Bug: 209867137
Change-Id: I044fb40f656beeb7c6e61f1d418fa13f56714a70
2021-12-14 17:56:26 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
8bb0d8f55d Merge "Log bp2build_metrics .pb" 2021-12-14 16:30:29 +00:00
Liz Kammer
bbabe6f3eb Ensure reported unconverted deps are unique
Test: m bp2build
Change-Id: I4a260d1f2ff9f6fd39c55c447466618fcdef52c7
2021-12-14 09:37:47 -05:00
Liz Kammer
be46fccc40 Use one mutator for all bp2build conversion.
Each conversion required defining a separate mutator, which will each
operate on _all_ modules and requires each to repeat checks whether the
mutator should operator. Instead, we introduce a single mutator and
modules can define a ConvertWithBp2build to implement bp2build
conversion for that module.

Test: bp2build.sh
Bug: 183079158
Change-Id: I99d4b51f441c2903879092c5b56313d606d4338d
2021-12-14 09:37:45 -05:00
Rupert Shuttleworth
d469eefcc3 Merge "Handle includes for generated headers" am: 6f32f95b25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918455

Change-Id: I2f5a84791ff7f396ae0b1cb571c46a8f9810f9f0
2021-12-14 00:26:34 +00:00
Rupert Shuttleworth
6f32f95b25 Merge "Handle includes for generated headers" 2021-12-14 00:11:26 +00:00
Matthew Maurer
a946b1b117 Merge "rust: Migrate default edition to 2021" am: c207773056
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1920524

Change-Id: Iee94c8ee0f7cc2da511aaeee315c6ac1451a71d3
2021-12-13 21:30:53 +00:00
Matthew Maurer
c207773056 Merge "rust: Migrate default edition to 2021" 2021-12-13 21:10:13 +00:00
Treehugger Robot
32c7110a57 Merge "Java used-by API list generation" am: 34e9ae2802
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918453

Change-Id: Ia9e8c929d301f984b9565f9703e9c26d1bfec36f
2021-12-13 20:51:00 +00:00
Treehugger Robot
34e9ae2802 Merge "Java used-by API list generation" 2021-12-13 20:28:54 +00:00
Matthew Maurer
c1738b449b rust: Migrate default edition to 2021
Bug: 210475268
Test: Presubmit
Change-Id: I915a8779c032dc463bf76a1a41f545d29a7be044
2021-12-13 18:20:53 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
947fdbfdee Log bp2build_metrics .pb
Also share `Save(pb proto.Message, filepath string)`

Bug: 201539536
Test: bp2build_metrics.pb has expected content & path
Test: m nothing
Test: {bp2build,mixed_{libc,droid}}.sh
Test: CI
Change-Id: I7d8ad87fca6a4b0355010090a527f5ae67b27c88
2021-12-13 13:03:44 -05:00
Liz Kammer
1263d9bdb1 Handle includes for generated headers
For generated headers, Soong introduces the package to the includes (and
re-exports as necessary).

Test: bp2build.sh
Change-Id: Iea9cda859ddaa3e5393f0f4533c15fc60222c408
2021-12-13 12:06:39 -05:00
Martin Stjernholm
49df6778ca Merge "Do not allow duplicate deapexer dependencies." am: d7c3fc0ae0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752641

Change-Id: I14c67990dfd06d096e40f24430ef407ded4a8859
2021-12-13 16:07:20 +00:00
Martin Stjernholm
d7c3fc0ae0 Merge "Do not allow duplicate deapexer dependencies." 2021-12-13 15:52:19 +00:00
Rupert Shuttleworth
afbbd4316d Add initial support for use_version_lib. am: 484aa25875
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918278

Change-Id: I9a5320f41df829088a7df3f6d4297442b303b91a
2021-12-13 14:00:14 +00:00
Rupert Shuttleworth
484aa25875 Add initial support for use_version_lib.
Test: Resolves build error for BP2BUILD_VERBOSE=1 b build //packages/modules/adb:libadbd_core
Test: Added unit test

Bug: 208481704

Change-Id: I4022c686c7baf050de3f97295fe4654515622a66
2021-12-13 06:21:16 -05:00
Jingwen Chen
d6b0aab0cd Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." am: 8d0bd355fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913474

Change-Id: If2bbf9c060a9730495119f2e662b0183d81a0d66
2021-12-13 10:25:54 +00:00
Jingwen Chen
8d0bd355fd Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." 2021-12-13 10:03:50 +00:00
Alexander Smundak
f0e94114d7 Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." am: 789e5026b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895824

Change-Id: Iebeaa0117931c3255173d0d98738a43a59b191c8
2021-12-12 22:49:18 +00:00
Alexander Smundak
789e5026b4 Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." 2021-12-12 22:26:58 +00:00
Treehugger Robot
45b20269f6 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" am: f4c2bf6559
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918949

Change-Id: I2ed8190fa32f751c1c79dd0417e5966532e5b031
2021-12-11 03:48:27 +00:00
Colin Cross
d8395b1b2f Revert^2 "Build license metadata files in Soong" am: 4acaea9cbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918948

Change-Id: I8682f46f7843e0d367b96a09135dad03e3df934c
2021-12-11 03:48:25 +00:00
Treehugger Robot
f4c2bf6559 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV"
* changes:
  Revert^2 "Add dependency license annotations"
  Revert^2 "Build license metadata files in Soong"
2021-12-11 03:32:18 +00:00
Sasha Smundak
827aead340 Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set.
Test: build with ANDROID_QUIET_BUILD=true, observe no progress messages
Change-Id: I98b9a657affa2ebbf86c9c081d51c31698072fed
2021-12-10 16:42:34 -08:00
Colin Cross
34ca826598 Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918944

Change-Id: Ie9cf2ab1249044ce0b52b8511c0a49e11f74a484
2021-12-10 23:20:51 +00:00
Colin Cross
a7fcadce74 Revert "Add dependency license annotations" am: abe2a4b7bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I9438dc5f70a9e30071a051c11dd25f36789822d0
2021-12-10 23:20:49 +00:00
Colin Cross
4acaea9cbf Revert^2 "Build license metadata files in Soong"
b3264f2090

Change-Id: I5ea5f7e29eb1dbc72b8b30f010006a25f5f72fac
2021-12-10 23:05:02 +00:00
Colin Cross
65cb314c92 Revert^2 "Add dependency license annotations"
abe2a4b7bf

Change-Id: Ibcd16b5b779a4e6d4372dab9d21de76abae9ca9c
2021-12-10 23:05:02 +00:00
Colin Cross
67938c2925 Merge changes from topic "revert-1899703-AMWIVCREEV"
* changes:
  Revert "Build license metadata files in Soong"
  Revert "Add dependency license annotations"
2021-12-10 23:04:45 +00:00
Colin Cross
b3264f2090 Revert "Build license metadata files in Soong"
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I48f2bf2e2797ac9d38f7ece35ba616b823035607
2021-12-10 23:02:57 +00:00
Colin Cross
abe2a4b7bf Revert "Add dependency license annotations"
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I51f33ae67311a3cff00d3e581d24c9a3411b7131
2021-12-10 23:02:41 +00:00
Colin Cross
9a6e17e5c1 Merge changes from topic "soong-license-metadata" am: b435744fdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899703

Change-Id: Ie9ffd26bb391ae9bd0ca946dbd01a2e2e076da6c
2021-12-10 22:04:44 +00:00
Colin Cross
05ff6289c2 Build license metadata files in Soong am: 3dd2ff28ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I96620d254f43dd9e8cfe02d1ed1dbc201c9cd381
2021-12-10 22:04:43 +00:00
Colin Cross
72d35eb0a5 Escape Host*Variable contents am: 1c35f243c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915494

Change-Id: I78a98453a932c7cace65bfaf0c2d39a2469342e6
2021-12-10 22:04:40 +00:00
Colin Cross
b435744fdc Merge changes from topic "soong-license-metadata"
* changes:
  Add dependency license annotations
  Build license metadata files in Soong
  Escape Host*Variable contents
2021-12-10 21:43:49 +00:00