Commit graph

4424 commits

Author SHA1 Message Date
Bob Badour
0e1befd4d1 Merge "Fix Neural Networks API notice." am: 229b7c4234 am: 25ae3ce9b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121038

Change-Id: I42131a379630937375d3d68c1b4d68c02d7bb5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 14:21:05 +00:00
Bob Badour
229b7c4234 Merge "Fix Neural Networks API notice." 2022-06-09 13:32:08 +00:00
Bob Badour
0d364eead5 Fix Neural Networks API notice.
Must quote the PackageName for embedded spaces.

Bug: 233936718

Test: m droid dist

Change-Id: Ida57800a9e733517f773faea92c90a357e0f58af
2022-06-08 18:20:27 -07:00
Cole Faust
2dd69922af Merge "Make filegroup paths relative to module dir in mixed builds" am: 5c6ebfa08c am: c6cba0c3ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2116276

Change-Id: I986f2472e3dad8bdade2543c002dc97bbb1f233f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 22:56:49 +00:00
Cole Faust
9a06d25be2 Make filegroup paths relative to module dir in mixed builds
filegroup.srcs must have a .rel() version of their paths
that is relative to the module directory. Previously in
mixed builds, the relative path wasn't filled in.

Bug: 229251008
Bug: 204244290
Test: go tests, and USE_BAZEL_ANALYSIS=1 m apexer with the following cl
Change-Id: I11a2a8b96139e0e7b956fa4c256a9a99c02f88f3
2022-06-08 11:47:24 -07:00
Sam Delmerico
b0837c2fe2 Merge "add multilib data_device_bins properties" am: a22e2c982d am: 88fa2f6a6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2113524

Change-Id: Id91e9272c91768dd95cd549d9860667f8fe30a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 14:53:22 +00:00
Trevor Radcliffe
d456182dd1 Merge "Enable Mixed Builds for Prebuilt Library" am: 74e8df0741 am: d6b70adce7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101150

Change-Id: Ia64712d0ca085e856c569ac6d06e58299d54e34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 14:53:08 +00:00
Sam Delmerico
a22e2c982d Merge "add multilib data_device_bins properties" 2022-06-08 14:07:11 +00:00
Trevor Radcliffe
74e8df0741 Merge "Enable Mixed Builds for Prebuilt Library" 2022-06-08 13:51:13 +00:00
Trevor Radcliffe
5d6fa4d857 Enable Mixed Builds for Prebuilt Library
This change provides support for mixed builds for
cc_prebuilt_library modules and allowlists some such modules.

Fixes: 225938765
Test: Unit tests, run mixed builds and verify correctness
Change-Id: I04396c79661df6b9a43907859e4f96d0191e8e1b
2022-06-07 20:36:53 +00:00
Romain Jobredeaux
3962a8eff4 Merge "Allow empty zip file in extra files in install command." am: 41758c71be am: 9eadd04b98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100283

Change-Id: Ie566bd3e5e709abbb2ac7f52000f8e8094cc8160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 15:53:41 +00:00
Romain Jobredeaux
41758c71be Merge "Allow empty zip file in extra files in install command." 2022-06-07 15:14:18 +00:00
Sam Delmerico
cc271e2065 add multilib data_device_bins properties
Some targets need to be able to specify the specific architecture for a
data_device_bin module. This commit adds new properties to allow
specification of first, both, 32, or 64 multilib properties.

Bug: 231448797
Bug: 232408185
Test: go test ./java -run TestDataDeviceBinsBuildsDeviceBinary
Change-Id: I457cf4b1a9ccb28b46042f874c96bd0a87009fab
2022-06-06 20:11:46 +00:00
Usta Shrestha
d2f726e468 Merge "minor dead code: unused format string" am: 93a9b9f471 am: bf241fdadf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115093

Change-Id: I3301e7210e56bba2c04832b37421b9cc46e2e4e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:33:53 +00:00
Usta Shrestha
93a9b9f471 Merge "minor dead code: unused format string" 2022-06-06 17:00:34 +00:00
Treehugger Robot
f938138325 Merge "Tool to create license metadata for copied target." am: 85f98765d2 am: 356a0bdfca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2107157

Change-Id: I5fa26cedbb420a0b2706083a8179a23228d84f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:39:57 +00:00
Treehugger Robot
85f98765d2 Merge "Tool to create license metadata for copied target." 2022-06-03 02:05:02 +00:00
Liz Kammer
400896e0d7 Merge "Handle restricting to device only builds" am: 62ac8a0707 am: 33d59b4ef5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098530

Change-Id: I4af093f3422811db07721da60f8c2f1c7700aeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:16:24 +00:00
Liz Kammer
62ac8a0707 Merge "Handle restricting to device only builds" 2022-06-02 20:29:27 +00:00
Vinh Tran
255c5d4981 Merge changes from topics "bp2build-gensrcs", "bp2build-gensrcs-gendir" am: a1675a539f am: c4a69eb376
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2108333

Change-Id: I13a01a10fdb0d12de4d9b52fdf6f8a15941cc5fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 18:20:24 +00:00
Treehugger Robot
4815e771f9 Merge "Make sure dist files have license metadata." am: f57b54cda7 am: c688531cba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063295

Change-Id: I09562d127844d389cb6af0c13833c6a463c826ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 18:19:54 +00:00
Vinh Tran
a1675a539f Merge changes from topics "bp2build-gensrcs", "bp2build-gensrcs-gendir"
* changes:
  Allowlist integration test for gensrcs
  Modify ConvertWithBp2build mutator to convert gensrcs to Bazel rule
2022-06-02 17:51:48 +00:00
Treehugger Robot
f57b54cda7 Merge "Make sure dist files have license metadata." 2022-06-02 17:37:46 +00:00
Usta Shrestha
2ccdb42098 minor dead code: unused format string
Using URL base64 encoding
(without padding, i.e. with trailing '=' or '==')
hash string width is 256/6 = 43 characters.

file size virtually unchanged,
  out/soong/build.ninja:  7,188,669,041 => 7,186,999,370 ie 1.6M

Bug: N/A
Test: manually verified (e.g. ran `m nothing` successfully)
Change-Id: I166d613e1fd857555da9611d420d6691806571c7
2022-06-02 11:37:20 -04:00
Bob Badour
4e7d74ceee Add gen_notice test. am: afd99fd305 am: c687edfae5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2103667

Change-Id: Ia66f0e5ce822f9539bd229d6831dbb117bc18734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 04:56:11 +00:00
Bob Badour
5180438478 Make sure dist files have license metadata.
Bug: 151177513
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I0c85f6c49a3e9d9bb3219ed6ddfb939d90f80656
2022-06-01 21:07:25 -07:00
Bob Badour
5a1fcab110 Tool to create license metadata for copied target.
Bug: 213388645

Test: m copy_license_metadata
Test: m cts dist reportmissinglicenses

Change-Id: I75c196ceca221effb2d6c972e250f5d42854e42f
2022-06-01 18:56:26 -07:00
Bob Badour
afd99fd305 Add gen_notice test.
Test: m cts dist reportmissinglicenses
Change-Id: I1d630c3d14d27b7605ab13d204d34b6851a24d33
2022-06-01 17:57:00 -07:00
Vinh Tran
b69fd88773 Allowlist integration test for gensrcs
Tests are in aosp/2108410

Test: b build //build/bazel/examples/gensrcs/...
Bug: 179452413
Change-Id: Iea7da04d92ba7b6ac3d555d5f35765a48a68bf65
2022-06-01 20:28:39 +00:00
Cole Faust
fc821c4892 Merge "Allowlist apexer tools" am: 44b368df87 am: ef4c9a4a94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2111813

Change-Id: I13d5940dc0c39fb7e91a2bed003d04dbd3edbe24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 16:33:36 +00:00
Cole Faust
91a2e1020f Allowlist apexer tools
Bug: 204244290
Test: ./build/bazel/ci/bp2build.sh
Change-Id: I6bfe64bd435b721eb61eed2578ec9df02c7583d1
2022-05-31 16:13:46 -07:00
Liz Kammer
dfeb120324 Handle restricting to device only builds
By default, most module types are only enabled for device. Converting
this behavior and host_supported/device_supported properties allows us
to skip building incompatible targets.

Test: soong tests
Test: bp2build.sh
Change-Id: If1da523b4cc8c4cbf2bb26da063d9923b662cc32
2022-05-31 17:46:48 -04:00
Cole Faust
123a1fbabd Merge "Add bp2build converter for python protobuf files" am: 5317be265a am: 06c53221cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099296

Change-Id: I84c420d928dfaa6ec2eddb9fada5019d90d6750c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 20:00:29 +00:00
Cole Faust
5317be265a Merge "Add bp2build converter for python protobuf files" 2022-05-31 19:22:32 +00:00
Jingwen Chen
394f17a1f9 Denylist f2fscrypt because it's failing to compile for the host. am: 24a060cf88 am: ddfc7df790
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2110089

Change-Id: Icc361dfa8778ae61ffbf9903910ccf0e864598e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 05:44:12 +00:00
Jingwen Chen
24a060cf88 Denylist f2fscrypt because it's failing to compile for the host.
Bug: 234340806
Test: bp2build.sh (CI)
Change-Id: Id437611f35a387949c664ff4385c464c12ce51f5
2022-05-30 14:19:01 +00:00
Cole Faust
b1848aa05f Merge "Allowlist tools that apexer uses" am: 97fd87e4db am: 1db05f65a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100359

Change-Id: Ib5da5bf1b13909e7a8ada353c9f4ab20f2fa4f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:54:26 +00:00
Cole Faust
97fd87e4db Merge "Allowlist tools that apexer uses" 2022-05-27 20:21:39 +00:00
Treehugger Robot
1f02fe781a Merge "Add filegroup srcs to json module graph" am: 0e3d36c582 am: c0f5453c29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2107304

Change-Id: If6f12e2425dfa1a31573b36141ab9f3bdc606cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 14:09:48 +00:00
Treehugger Robot
0e3d36c582 Merge "Add filegroup srcs to json module graph" 2022-05-27 13:29:54 +00:00
Cole Faust
53b62098d0 Add bp2build converter for python protobuf files
Bug: 196084681
Test: b run //build/bazel/examples/python/protobuf:build_bazel_examples_python_protobuf_main --config=linux_x86_64
Change-Id: I4d806902d262351231f64686a5d24513a25d9749
2022-05-26 15:54:23 -07:00
Liz Kammer
5edc1411ee Add filegroup srcs to json module graph
This will allow us to do json analysis on a filegroup's inputs as they
will now have a corresponding phony action.

Test: m json-module-graph and check module-actions.json
Change-Id: Id1ab681c01689eef06205d4a7fe8cf8b9110c628
2022-05-26 16:14:33 -04:00
Cole Faust
ba95b11146 Allowlist tools that apexer uses
Apexer uses a lot of extra binaries, and most
of them already build fine but haven't been
allowlisted.

After this cl, only aapt2 and sefcontext_compile
will still be needed for apexer to run.

Bug: 233346273
Test: b build --config=linux_x86_64 //build/make/tools/zipalign:zipalign //external/f2fs-tools:make_f2fs //external/f2fs-tools:sload_f2fs //external/erofs-utils:make_erofs
Change-Id: I1b721d998c7d1f89d62fce30f565b8422e2dd74a
2022-05-26 12:54:09 -07:00
Trevor Radcliffe
2bb24935e4 Merge "Generate genlex rules from bp2build for cc targets" am: 5731d0fffd am: c68fbc38e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092784

Change-Id: I91cba2b4927db6e1284efcf82161f81f4216bebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 20:32:59 +00:00
Trevor Radcliffe
5731d0fffd Merge "Generate genlex rules from bp2build for cc targets" 2022-05-25 19:38:15 +00:00
Sorin Basca
ec9d37f146 Merge "Add experimental option to target Java 17" am: 78ce8c23de am: a571b7d389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104326

Change-Id: Iac56194ce46c845e0498e0fb794f4eb29895d78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 16:10:38 +00:00
Sorin Basca
78ce8c23de Merge "Add experimental option to target Java 17" 2022-05-24 15:12:14 +00:00
Liz Kammer
3d704c2826 Merge "Handle multiple linkages in sdk snapshots" am: 91f10eccc6 am: 1446249224
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097793

Change-Id: I5f428f85d998cde7a90d3cf361480a66363ae3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:55:28 +00:00
Trevor Radcliffe
ef9c900ec3 Generate genlex rules from bp2build for cc targets
This change will cause bp2build to generate genlex targets any
time a .l or .ll file is present in the srcs for a cc target and
add those genlex targets to the srcs attribute of the original
target.

Bug: 207408632
Test: unit tests
Change-Id: I1bce82c9d3c3d458eae1cef547ffae3d6e975134
2022-05-24 14:42:51 +00:00
Liz Kammer
91f10eccc6 Merge "Handle multiple linkages in sdk snapshots" 2022-05-24 14:13:19 +00:00