Paul Duffin
4c6b51a1d5
Merge changes I093fbec4,Iee5c09d5 am: 1db9d96d6a
am: 7d40722b8f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062449
Change-Id: Iee15dd53c385454ef8dd1e3f59c813dbf8a68d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 10:14:03 +00:00
Paul Duffin
7d40722b8f
Merge changes I093fbec4,Iee5c09d5 am: 1db9d96d6a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062449
Change-Id: I0694e6503a98ec3eaac8703dc3f63ef4241e6a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 09:42:14 +00:00
Paul Duffin
1db9d96d6a
Merge changes I093fbec4,Iee5c09d5
...
* changes:
bootclasspath_fragment: Treat some specific modules as test
bootclasspath_fragment: Add test specific module type
2022-05-30 09:26:24 +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
1db05f65a4
Merge "Allowlist tools that apexer uses" am: 97fd87e4db
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100359
Change-Id: I9abd647743f03b0b842196cc6e7c973741310720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 20:35:30 +00:00
Cole Faust
97fd87e4db
Merge "Allowlist tools that apexer uses"
2022-05-27 20:21:39 +00:00
Treehugger Robot
49ae313fb5
Merge "cosmetic: name receiver consistently see go/go-style/decisions#receiver-names" am: 6c898fbb6e
am: 9437e24c47
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2108326
Change-Id: Iba28ec9e419a10c136c901329c6a965bbe25108f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 18:42:04 +00:00
Hasini Gunasinghe
180817c847
Merge "Add system/core/trusty/keymint-rust to allow list" am: 783e76c738
am: 50d22b822a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089843
Change-Id: I57b5bff1d3d385616a081c0b7f95542af5243d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 18:41:55 +00:00
Treehugger Robot
9437e24c47
Merge "cosmetic: name receiver consistently see go/go-style/decisions#receiver-names" am: 6c898fbb6e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2108326
Change-Id: Ifa82d7898672565bb5d5f838e50da9a664dc7c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 18:23:10 +00:00
Hasini Gunasinghe
50d22b822a
Merge "Add system/core/trusty/keymint-rust to allow list" am: 783e76c738
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089843
Change-Id: Ia4ec53a512f5ef9642146e8a1641b05415bcfabe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 18:22:59 +00:00
Treehugger Robot
6c898fbb6e
Merge "cosmetic: name receiver consistently see go/go-style/decisions#receiver-names"
2022-05-27 18:22:33 +00:00
Hasini Gunasinghe
783e76c738
Merge "Add system/core/trusty/keymint-rust to allow list"
2022-05-27 17:57:51 +00:00
Paul Duffin
ac23cbba12
Merge "Check that API is up-to-date when building java_sdk_library" am: 54e0bb61f0
am: 15e5b40b39
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2107342
Change-Id: I96f41264bc8a79d010b76740500a2698d13eedf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:36:43 +00:00
Paul Duffin
15e5b40b39
Merge "Check that API is up-to-date when building java_sdk_library" am: 54e0bb61f0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2107342
Change-Id: Ibe00720a9a9ff6a8d3363ac569774829cbd70b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:20:20 +00:00
Paul Duffin
54e0bb61f0
Merge "Check that API is up-to-date when building java_sdk_library"
2022-05-27 16:01:57 +00:00
Paul Duffin
ff9b6faba2
bootclasspath_fragment: Treat some specific modules as test
...
Treats bootclasspath_fragment modules that have not yet been converted
to test modules as if they were test modules. This is a temporary work
around to ease the migration to bootclasspath_fragment_test modules and
is expected to be reverted.
Bug: 194063708
Test: m nothing
Change-Id: I093fbec4e926719b644c64ebfc63f9e3070e28db
2022-05-27 16:17:44 +01:00
Paul Duffin
c15b9e99e5
bootclasspath_fragment: Add test specific module type
...
This is needed to allow the behavior of the bootclasspath_fragment to
be tweaked for test fragments.
Bug: 194063708
Test: m nothing
Change-Id: Iee5c09d5b580d088ba081d95a788dbde883078ed
2022-05-27 16:17:44 +01:00
Usta Shrestha
c23724905b
cosmetic: name receiver consistently
...
see go/go-style/decisions#receiver-names
Bug: N/A
Test: N/A
Change-Id: Ifee42ff66cdb4db024a82ebd03cdee1c6d4fb5f7
2022-05-27 10:59:02 -04: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
Paul Duffin
c166b68589
Check that API is up-to-date when building java_sdk_library
...
Previously, the checked in version of an API was only checked to make
sure it was up-to-date when running the checkapi target. This change
adds a validation dependency to the ninja rule that generates the API
from source so that up-to-date check is always performed every time
the API is generated. However, because it is a validation dependency
it does not lengthen the build's critical path.
Bug: 234113632
Test: echo > packages/modules/SdkExtensions/java/android/os/ext/api/current.txt
m framework-sdkextension
# Passes without this change even though the checked in API is
# not up-to-date.
# With this change the build fails reporting correctly that the
# checked in API is not up-to-date.
Change-Id: I8e65cf716d94aecd61bd943f1485468664ad4a22
2022-05-27 14:03:44 +00:00
Treehugger Robot
c0f5453c29
Merge "Add filegroup srcs to json module graph" am: 0e3d36c582
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2107304
Change-Id: Ia8121c08147f20434046d535eab7f27bb0ab7f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 13:53:21 +00:00
Treehugger Robot
0e3d36c582
Merge "Add filegroup srcs to json module graph"
2022-05-27 13:29:54 +00:00
Hasini Gunasinghe
07851ffae4
Add system/core/trusty/keymint-rust to allow list
...
Bug: 225036046
Test: N/A
Change-Id: I2177960dc40c79a07d3acbc798b5235a26cfa72d
2022-05-26 22:58:10 +00: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
Treehugger Robot
dfeab6804b
Merge "Adding .iml files to .gitignore" am: ec6c065af6
am: a42430b765
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2108324
Change-Id: I48ac19d7546bec91a92d87cbaba4e86f36e94288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 20:02:23 +00: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
Treehugger Robot
a42430b765
Merge "Adding .iml files to .gitignore" am: ec6c065af6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2108324
Change-Id: I2fb3ad982fbfba295586787be32ad9cc66762d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 19:45:42 +00:00
Treehugger Robot
ec6c065af6
Merge "Adding .iml files to .gitignore"
2022-05-26 19:19:43 +00:00
Usta Shrestha
2712ef07a0
Adding .iml files to .gitignore
...
Bug: N/A
Test: N/A
Change-Id: Ica348d16e96addb2ef407655bc98de695cec7824
2022-05-26 12:16:03 -04:00
David Drysdale
7ffe6b9112
Merge "Add new system/keymint Rust directory" am: 95cf8e935a
am: 3a60dbb819
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2106304
Change-Id: I12b98c6f2d2c72aaa756b7b224e9fa532ea048ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 15:41:54 +00:00
David Drysdale
3a60dbb819
Merge "Add new system/keymint Rust directory" am: 95cf8e935a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2106304
Change-Id: I279fa1042ca3397266077e7427c3d32c23617b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 15:05:18 +00:00
David Drysdale
95cf8e935a
Merge "Add new system/keymint Rust directory"
2022-05-26 09:32:22 +00:00
Hsin-Yi Chen
ab255ae347
Merge "Add diff_flags as a header_abi_checker property" into tm-dev am: 39a9db3bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18482834
Change-Id: I6f53043eead9258ecc9903a3d779ed04df60aef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 05:24:08 +00:00
Hsin-Yi Chen
39a9db3bae
Merge "Add diff_flags as a header_abi_checker property" into tm-dev
2022-05-26 04:21:54 +00: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
c68fbc38e7
Merge "Generate genlex rules from bp2build for cc targets" am: 5731d0fffd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092784
Change-Id: I3d5ac491b377fb5da09f4e5a73c93779df210914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 20:07:02 +00:00
Trevor Radcliffe
5731d0fffd
Merge "Generate genlex rules from bp2build for cc targets"
2022-05-25 19:38:15 +00:00
Treehugger Robot
ce10c28eb9
Merge "sdkLibraryProperties: fix typo" am: bf04adae7c
am: 4ca266f966
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2106444
Change-Id: I85e03e534a8e08c59833f410b855002eaa0a3523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 17:30:06 +00:00
Treehugger Robot
4ca266f966
Merge "sdkLibraryProperties: fix typo" am: bf04adae7c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2106444
Change-Id: I4df365e81acc2c66bb252b13d44d945c55047671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 17:01:15 +00:00
Treehugger Robot
bf04adae7c
Merge "sdkLibraryProperties: fix typo"
2022-05-25 16:29:47 +00:00
Mårten Kongstad
81d909525d
sdkLibraryProperties: fix typo
...
Test: m nothing
Change-Id: Id9a0ba0a1123a298b8713f6dd6526ccb54fe5c46
2022-05-25 16:27:55 +02:00
Treehugger Robot
fabcc07df5
Merge "raw_binary output should not be executable." am: 86db8821bb
am: 52bebd6fa4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104332
Change-Id: I47ae5d863515822f3904a2a4b39c22ad40553894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 13:14:47 +00:00
David Drysdale
21252b460a
Add new system/keymint Rust directory
...
Bug: 195310053
Test: build, TreeHugger
Change-Id: I5bb3c000324fb8150bdd00ec8b8ca9ed79ceba06
2022-05-25 13:57:13 +01:00
Treehugger Robot
52bebd6fa4
Merge "raw_binary output should not be executable." am: 86db8821bb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104332
Change-Id: Ie93f6f2c4fe865da03b5266ecfe684babbb4e9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:46:13 +00:00
Treehugger Robot
86db8821bb
Merge "raw_binary output should not be executable."
2022-05-25 12:28:27 +00:00
Lukács T. Berki
4fe7cae2af
Merge "Remove support for generating versioned snapshots" am: 3ef0581cda
am: 298da6fc78
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105804
Change-Id: I0356e0a5ef5d53bcf9c2bd059495c9c0dbc60b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:54:27 +00:00
Lukács T. Berki
298da6fc78
Merge "Remove support for generating versioned snapshots" am: 3ef0581cda
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105804
Change-Id: I35affd2f6970f7d1122db105c932fddf4aac1a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:25:22 +00:00
Lukács T. Berki
3ef0581cda
Merge "Remove support for generating versioned snapshots"
2022-05-25 10:59:32 +00:00
Yi Kong
6faa9b759a
Merge "Enable string-compare warning" am: f13a66adfd
am: e99fbffa25
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098017
Change-Id: I615039bbe1d8ba084bda367b836184b4c6606475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:02:30 +00:00
Yi Kong
e99fbffa25
Merge "Enable string-compare warning" am: f13a66adfd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098017
Change-Id: I1b0c50bd29d456f3f19be7965d239809430a13a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:25:15 +00:00