Commit Graph

66239 Commits

Author SHA1 Message Date
Treehugger Robot
04a1809d2a Merge "Handle missing dependencies in mixed builds" 2023-05-23 16:07:01 +00:00
Jihoon Kang
5a9972e03a Merge changes Idc77d018,I7dff0094 am: 4aed3703dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583270

Change-Id: Ica1d59814378416d5db05dbe7811820806aff8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 12:16:08 +00:00
Liz Kammer
c13f785061 Handle missing dependencies in mixed builds
Bazel will fail on queries with missing dependencies. Instead, we check
for missing dependencies in mixed builds and we fall back to Soong when
we are aware of missing dependencies in a module.

Test: go test soong tests
Change-Id: I4f83752704970d8b43650d5b55ff35799c7bc625
2023-05-23 12:14:02 +00:00
Jihoon Kang
4aed3703dd Merge changes Idc77d018,I7dff0094
* changes:
  Enable java_api_library modules in TxtStubLibraries.bp
  Add missing dependency in create_mock_soong
2023-05-23 11:26:53 +00:00
Treehugger Robot
bc2cc0f5fe Merge changes from topic "b/278060169" am: 634692f131
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2599425

Change-Id: I7bed252fb439237a852ead7f87f0e49d402ae1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:10 +00:00
Jeongik Cha
6caa584a9f BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 4e49bbde93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2563996

Change-Id: Id17385fe5c9a10cb25d2f73372a4e264e0d7db65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:02 +00:00
Treehugger Robot
634692f131 Merge changes from topic "b/278060169"
* changes:
  Unset BUILD_NUMBER/HOSTNAME in kati.go
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
2023-05-23 08:56:48 +00:00
Jihoon Kang
b34bb06780 Enable java_api_library modules in TxtStubLibraries.bp
Since the stubs generation from text file feature has been merged,
enable the java_api_library modules in TxtStubLibraries.bp file.

Test: m --build-from-text-stub
Change-Id: Idc77d01882f136c4e255fb4284f9dc058fafe44d
2023-05-23 07:32:04 +00:00
Jihoon Kang
f530696762 Add missing dependency in create_mock_soong
This change adds missing dependency of Soong modules as symlink
directory in create_mock_soong so that a correct ninja graph can be
created when invoking androidmk_test.sh.

Test: build/soong/test/run_integration_tests.sh
Bug: 283905797
Change-Id: I7dff0094fdc23b7c438c917dbc00a5143a4dc5ae
2023-05-23 06:57:38 +00:00
Jeongik Cha
f2af38d2cc Unset BUILD_NUMBER/HOSTNAME in kati.go
BUILD_NUMBER/HOSTNAME is passed by a file, not env variable.
To avoid kati recreation, unset BUILD_NUMBER/HOSTNAME after
writing it into a file

Bug: 278060169
Test: BUILD_NUMBER=1 m && BUILD_NUMBER=2 m (check there is no kati
re-run)

Change-Id: I5a31461dcf1e4b0634974bcb48a0d7482d42852a
2023-05-23 10:35:23 +09:00
Yu Liu
6a7940cc99 Support sandboxing genrule
Bug: 281067655
Test: local build
Change-Id: I123b5e51eaf1476d1215e5208331b6540d45fd98
2023-05-22 15:02:36 -07:00
Zi Wang
55745c05ac Merge "Add data_device_bins_both properties for python_test_host" am: 03cd59b723
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583210

Change-Id: Id21f553f0a37c2c97a9ded220592c5eed336c8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:12:05 +00:00
Treehugger Robot
71f4fc9ede Merge changes from topic "parallel-singletons" am: 47514686b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2593067

Change-Id: If64f8f4e8d77bcc07e51c214c766656736a406d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:11:35 +00:00
LaMont Jones
bef24e821a android: Allow running some singletons in parallel. am: e59c0db536
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2593066

Change-Id: I857157f74053e8f1afbd3c41c0b130c3ebc18dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:11:28 +00:00
Zi Wang
03cd59b723 Merge "Add data_device_bins_both properties for python_test_host" 2023-05-22 16:51:29 +00:00
Treehugger Robot
47514686b9 Merge changes from topic "parallel-singletons"
* changes:
  Parallelize singleton execution
  android: Allow running some singletons in parallel.
2023-05-22 16:40:16 +00:00
Jihoon Kang
4fa9e5f497 Fix bootclasspath_fragment build failure during from-text stub build am: 7e9e20e389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2558571

Change-Id: I3e144cef82e74f5abfb38c534f126ada7e991872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:29:30 +00:00
Jihoon Kang
cf7eb59754 Add additional java_api_library testing modules am: d0f9520414
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2558570

Change-Id: I3386a172d38481e774a522fe86bbd2bb7745df5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:29:28 +00:00
Jihoon Kang
7e9e20e389 Fix bootclasspath_fragment build failure during from-text stub build
This change enables bootclasspath_fragment module to be correctly built
during from-text stub build by android-non-updatable module to be
interpreted as its java_api_library equivalent.

Test: go test ./java
Bug: 279460171
Change-Id: Ia6b60edcb60782977cc59855f1cf5d3a46e9f682
2023-05-22 07:13:25 +00:00
Jihoon Kang
d0f9520414 Add additional java_api_library testing modules
This change adds android-non-updatable.stub.* java_api_library
modules to java testing.

Test: none
Change-Id: I10110a21cc61905995803dfc1d27484358019807
2023-05-22 07:13:07 +00:00
Jeongik Cha
4e49bbde93 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I65eefc6bb86d4076098a1bf8b317b4cb88201499
2023-05-22 12:22:18 +09:00
Jihoon Kang
7f225369a4 Merge "Generate java_api_library from java_sdk_library" am: d056a91b82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519477

Change-Id: I9de607f62fb214429db113a0c1a2b46758fd1290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 05:42:26 +00:00
Jihoon Kang
d056a91b82 Merge "Generate java_api_library from java_sdk_library" 2023-05-20 05:10:11 +00:00
Treehugger Robot
dd1a7ffff5 Merge "Enable referencing of aapt-generated proguard flags" am: 7fecde9041
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516696

Change-Id: I1de940d7b3bfadc5dbb9756941681f6bff70b2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 04:27:54 +00:00
Treehugger Robot
7fecde9041 Merge "Enable referencing of aapt-generated proguard flags" 2023-05-20 04:13:57 +00:00
Treehugger Robot
f49d3811bd Merge "Support missing instrumented_for dependency when ALLOW_MISSING_DEPENDENCIES=true" am: 36f3ed1191
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2596188

Change-Id: Id5280e963121ee52b8d98b3f9095195fc328176e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:13:19 +00:00
Usta (Tsering) Shrestha
5b3acb0e4d Merge "bp2build allowlist expanded" am: f836552617
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2597865

Change-Id: I0e27572fc27f9a4711d172df6bf61644e0bb685f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:13:00 +00:00
Treehugger Robot
36f3ed1191 Merge "Support missing instrumented_for dependency when ALLOW_MISSING_DEPENDENCIES=true" 2023-05-19 21:12:27 +00:00
Usta (Tsering) Shrestha
f836552617 Merge "bp2build allowlist expanded" 2023-05-19 21:00:24 +00:00
Trevor Radcliffe
82674cf652 Merge "CFI Versionscript changes in bp2build" am: 197f4306d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2597866

Change-Id: I03f28f05cd15b0bc976c0566427a1b2442f3ea2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 20:52:05 +00:00
LaMont Jones
0c10e4dcc0 Parallelize singleton execution
Bug: 281536768
Test: manual, presubmits
Change-Id: I57fdc76ba6b277e88e196b506af87127a530fd37
2023-05-19 20:31:32 +00:00
Jared Duke
34b080ddcf Enable referencing of aapt-generated proguard flags
Some targets may implement classes declared elsewhere, e.g., system
server implements services defined in framework-res.apk's manifest.
Allow depending on the aapt-generated proguard flags for a given
target to support this.

Bug: 272495195
Test: m + reference ":framework-res{.aapt.proguardOptionsFile}"
Change-Id: I2a16632ed6e5a9bddbe326bdb7ab0dd79b45e587
2023-05-19 20:30:05 +00:00
Trevor Radcliffe
197f4306d5 Merge "CFI Versionscript changes in bp2build" 2023-05-19 20:14:29 +00:00
Colin Cross
222511ff9f Merge changes from topic "musl_arm64" am: b3f28b2e04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2575412

Change-Id: Ia86f100f646a054eb286ccb6a96c5c6414d90643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 18:45:09 +00:00
Colin Cross
1a02372d90 Separate host and host cross fuzz packaging am: 64a4a5f5cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2593486

Change-Id: Ibdeee6be27d4076537e8ab12a4d7ef356e3108b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 18:45:07 +00:00
Colin Cross
b3f28b2e04 Merge changes from topic "musl_arm64"
* changes:
  Disable sanitizers that use runtimes for linux_musl arm64
  Separate host and host cross fuzz packaging
2023-05-19 18:03:22 +00:00
LaMont Jones
e59c0db536 android: Allow running some singletons in parallel.
Many of the singletons are trivial and can be run in parallel, improving
the performance during analysis.

Bug: 281536768
Test: manual, presubmit
Change-Id: I989333e2ff3fe71783601f27bf5e0732a1b4ea61
2023-05-19 18:01:35 +00:00
Zi Wang
bbb1b74cbf Add data_device_bins_both properties for python_test_host
Test: presubmits and manual verification

Bug: 274930471
Change-Id: Iafc85526afdb8264526e8a5a33319fa33a23c66b
2023-05-19 10:32:49 -07:00
Spandan Das
c1936499b2 Merge "Export host available libraries to soong_injection" am: fcb86824be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2596126

Change-Id: Ia790e223f28ec142d9c57e1fda578a220a89f5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:59:25 +00:00
Colin Cross
f521efae48 Support missing instrumented_for dependency when ALLOW_MISSING_DEPENDENCIES=true
Don't panic when the instrumented_for dependency is missing or when
instrumentedApp or files generated from instrumentedApp are nil.  Fixes
unbundled tradefed build.

Fixes: 283451533
Test: tapas google-tradefed-all && BUILD_BROKEN_DISABLE_BAZEL=true nothing on tradefed branch
Change-Id: Ibcd0da75fc55c7c0a697e98ae6bdd9fd3662259c
2023-05-19 09:47:09 -07:00
Usta Shrestha
6e5a5b18ee bp2build allowlist expanded
Bug: 282160334
Test: ran bp2build.sh
Change-Id: I354ded2cd4d2e9c89dc67ca8b9fdddd1c660ffa2
2023-05-19 16:45:56 +00:00
Spandan Das
fcb86824be Merge "Export host available libraries to soong_injection" 2023-05-19 16:18:01 +00:00
Jeongik Cha
d55347133f NINJA_LOG option uses usesninjalogasweightlist
As-is: Even with NINJA_LOG option, ninja weight list is copied from
ninja log
To-be: uses usesninjalogasweightlist to uses ninja log file directly

If weight list is large(more than 100,000 lines), reading the whole list
spends a few seconds(1-3s). It is ignorable in full build, but it might
be considerable in small build or m nothing scenario.

If weight list comes from ninja log, we can just directly read ninja log
data instead of writing weight list from ninja log outside, and read the
weight list. It doesn't spend additional time because ninja log is
loaded by default.

Bug: 271527305
Test: build with NINJA_LOG
Change-Id: Id7a4cca95898ce439d0a682f9bfd954b462f1849
2023-05-20 00:49:39 +09:00
Trevor Radcliffe
f06dd91420 CFI Versionscript changes in bp2build
Bug: 261733820
Test: Unit Tests
Change-Id: I0bf2f42944738c0fefb10e59e859d2af44402792
2023-05-19 14:51:41 +00:00
Treehugger Robot
f198801855 Merge "Enable host cross python test builds" am: aad1959a18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595089

Change-Id: I9abcd7696916867db821955e9b153b595c3c6b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 13:28:39 +00:00
Treehugger Robot
aad1959a18 Merge "Enable host cross python test builds" 2023-05-19 13:01:26 +00:00
Jihoon Kang
1c92c3e092 Generate java_api_library from java_sdk_library
This change enables java_sdk_library to generate java_api_library
modules per api surface, so that from-text stubs can be generated per
api domain scope. This module is only created when
`--build-from-text-stub` flag is passed during build.

Test: enable disabled modules in java/core-libraries/TxtStubLibraries.bp then m art.module.public.api.stubs.from-text --build-from-text-stub
Bug: 276957733
Change-Id: Ic1ead15b3d0bcb921ca8d31bcaeeb4cd9ee8715c
Merged-In: Ic1ead15b3d0bcb921ca8d31bcaeeb4cd9ee8715c
2023-05-19 06:07:37 +00:00
Jeongik Cha
f2ecf7659e Enable NINJA_LOG as weight list source
Bug: 273947040
Test: m
Change-Id: I1a803f5c1da75235395fc594e4f9d17f48c55db8
2023-05-19 14:03:45 +09:00
Aditya Kumar
1b65e2c186 Merge "Enable LTO for riscv64" am: e5dc6158d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2591987

Change-Id: I99c4a006fd0730f5f49049a875104d279a38ee00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 05:02:31 +00:00
Aditya Kumar
e5dc6158d2 Merge "Enable LTO for riscv64" 2023-05-19 04:27:38 +00:00