Colin Cross
865a62d8ca
Move java module installation into Soong am: 24cc4be60b
am: e2d3d87fcd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880650
Change-Id: I8b8c85a7f38e242b8592566923464fdbb0e2f653
2021-11-10 17:41:27 +00:00
Colin Cross
406461d954
Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0
am: c871fe905e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649
Change-Id: I7448eba4f4e278d7869269009465f632fcf4eddc
2021-11-10 17:41:26 +00:00
Colin Cross
e8aadabe21
Make HostJavaToolPath use pathForInstall am: ae5330a2d9
am: a8bd977845
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648
Change-Id: I9e89dc97ea860cb58dbc66ee9d67a22aec974046
2021-11-10 17:41:24 +00:00
Colin Cross
e2d3d87fcd
Move java module installation into Soong am: 24cc4be60b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880650
Change-Id: I9dfb4e0d5fd387258e5cf4cd9a7b73b4181fba69
2021-11-10 17:28:53 +00:00
Colin Cross
c871fe905e
Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649
Change-Id: I4c74ca35e116674a46cd382a9d856092a76a0e6c
2021-11-10 17:28:52 +00:00
Colin Cross
a8bd977845
Make HostJavaToolPath use pathForInstall am: ae5330a2d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648
Change-Id: I0e35100226020451befb3993cf3b3c44b34af010
2021-11-10 17:28:49 +00:00
Laura Tsai
fb1e24c1c7
Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983
am: 463f87c7c5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670
Change-Id: Iadd1923b060b8c48f38702fbf9a81720084a4565
2021-11-10 07:31:51 +00:00
Laura Tsai
463f87c7c5
Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670
Change-Id: I5fb3d8d117075783371c55af84991d51479d91ff
2021-11-10 07:12:40 +00:00
Laura Tsai
33b60e4983
Merge "Revert "Add scripts to generate java APIs used by Mainline modules.""
2021-11-10 07:00:38 +00:00
Laura Tsai
be3c7eacfe
Revert "Add scripts to generate java APIs used by Mainline modules."
...
This reverts commit c92380f001
.
Reason for revert:
DroidMonitor:
DroidMonitor-triggered revert due to breakage
https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=mainline_modules_arm64-userdebug&lkgb=7898389&lkbb=7900541&fkbb=7898474 ,
bug 205746850
Change-Id: Ibd84dfe68dfe150b7e05b4287364d1946375bf72
2021-11-10 06:59:37 +00:00
Alexander Smundak
19a0e5f55e
Merge changes Ia41a5a2e,Ib29654e7 am: 45f97c6a1e
am: 63861ddea8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883569
Change-Id: I99af4477e2f270b4762253bb6818a30733c76776
2021-11-10 01:43:11 +00:00
Alexander Smundak
63861ddea8
Merge changes Ia41a5a2e,Ib29654e7 am: 45f97c6a1e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883569
Change-Id: Ia4bc0dcd0edf6420a18385e2fc5c23649edfbb23
2021-11-10 01:25:48 +00:00
Jooyung Han
75a0719cbf
Merge "Pass --min_sdk_version to aidl compiler" am: a5b538394c
am: 29b2f3e48a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883408
Change-Id: I5970216bc2f69c6fac8e6e430f6109958eaed549
2021-11-10 01:13:26 +00:00
Alexander Smundak
45f97c6a1e
Merge changes Ia41a5a2e,Ib29654e7
...
* changes:
Allow non-constant from/to arguments in subst and patsubst
Handle ifdef for local variables.
2021-11-10 01:07:17 +00:00
Jooyung Han
29b2f3e48a
Merge "Pass --min_sdk_version to aidl compiler" am: a5b538394c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883408
Change-Id: I6866db86875c19491c625e11764256003aaf6fca
2021-11-10 00:52:12 +00:00
Jooyung Han
a5b538394c
Merge "Pass --min_sdk_version to aidl compiler"
2021-11-10 00:31:54 +00:00
Jose "Pepe" Galmes
b9be67b911
Merge "Support for rust recovery snapshot." am: cd3af1e52c
am: 32bfcdb916
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885929
Change-Id: Ic1eb7569560aa60226f40d6cdaa21f40ed84b20c
2021-11-09 20:36:09 +00:00
Jose "Pepe" Galmes
32bfcdb916
Merge "Support for rust recovery snapshot." am: cd3af1e52c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885929
Change-Id: I45755bb556ff318ad2f4bf7442dfcbb45c8f0921
2021-11-09 20:16:25 +00:00
Jose "Pepe" Galmes
cd3af1e52c
Merge "Support for rust recovery snapshot."
2021-11-09 19:39:32 +00:00
Sophie Zheng
240288cbbd
Merge "Add scripts to generate java APIs used by Mainline modules." am: 4bb0b7a0c3
am: 5518e10391
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879177
Change-Id: I9c69d1d0b687b2b00d2438eb2a097df7cfdeebb7
2021-11-09 17:57:42 +00:00
Sophie Zheng
5518e10391
Merge "Add scripts to generate java APIs used by Mainline modules." am: 4bb0b7a0c3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879177
Change-Id: I2f84fcc8831bfc07eb8f92f7cbd50347cd613659
2021-11-09 17:34:04 +00:00
Treehugger Robot
9e5af52b97
Merge changes from topic "soong-rust-install" am: f50bfc9d47
am: 664b9e0016
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885089
Change-Id: Ib61c10ee66f150b1acb61607edc9c851a6931a4c
2021-11-09 17:14:24 +00:00
Colin Cross
ab64bbf763
Move rust module installation into Soong am: 7743557a23
am: b68b4f9ece
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885088
Change-Id: Ibe11ee7febae27dd40a2958e008d5b67a3a55689
2021-11-09 17:14:23 +00:00
Sophie Zheng
4bb0b7a0c3
Merge "Add scripts to generate java APIs used by Mainline modules."
2021-11-09 17:13:33 +00:00
Treehugger Robot
664b9e0016
Merge changes from topic "soong-rust-install" am: f50bfc9d47
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885089
Change-Id: Ibd7ddd66a426a3e2f9476764fb314570b6c6a8c2
2021-11-09 16:49:48 +00:00
Colin Cross
b68b4f9ece
Move rust module installation into Soong am: 7743557a23
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885088
Change-Id: If9806abbc53ad7361e3a110d6f1737665660df62
2021-11-09 16:49:46 +00:00
Jose Galmes
d7d99be225
Support for rust recovery snapshot.
...
Bug: 197866992
Test: source build/envsetup.sh
Test: m -j nothing
Change-Id: I02bb188669cf9f17073592a4622998f96d5f54ac
2021-11-09 08:40:50 -08:00
Treehugger Robot
f50bfc9d47
Merge changes from topic "soong-rust-install"
...
* changes:
Move sh_binary module installation into Soong
Move rust module installation into Soong
2021-11-09 16:29:36 +00:00
Jingwen Chen
6a2ae1354a
Fix test to use --experimental_platform_in_output_dir. am: ba6d4ac226
am: b9b4687e6d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885748
Change-Id: Ie7ab3502ec1c0a15c1dbbdf4b80e83c98a6c2315
2021-11-09 16:19:42 +00:00
Jingwen Chen
b9b4687e6d
Fix test to use --experimental_platform_in_output_dir. am: ba6d4ac226
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885748
Change-Id: Ie579e061d5c303fc82f04ee6cde619cf70348209
2021-11-09 15:54:56 +00:00
Jingwen Chen
ba6d4ac226
Fix test to use --experimental_platform_in_output_dir.
...
Bug: 197925723
Test: CI
Change-Id: I89dfb38efe261f008e7aab8d76eb3ff5c18add69
2021-11-09 11:55:36 +00:00
Jingwen Chen
81cbd8462a
Merge "bp2build: add support for soong_config_module_type." am: 8c10020ffd
am: a207f3a127
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878091
Change-Id: Ia6c2af4c70e5433d3365260c94c6b8a23ce82001
2021-11-09 07:48:34 +00:00
Jingwen Chen
a207f3a127
Merge "bp2build: add support for soong_config_module_type." am: 8c10020ffd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878091
Change-Id: I20344b9df4ed305c3c83b78c53c1376016fd1c7c
2021-11-09 07:24:53 +00:00
Jingwen Chen
8c10020ffd
Merge "bp2build: add support for soong_config_module_type."
2021-11-09 06:59:34 +00:00
Colin Cross
7e07e20723
Move sh_binary module installation into Soong
...
Move sh_binary module installation rules into Soong by overriding
InstallBypassMake.
Bug: 204136549
Bug: 205530905
Test: m checkbuild
Test: m && acloud create --local-instance --local-image
Change-Id: I3f9928c6d6993c381859b80c335b800b1a9769ee
2021-11-08 13:32:02 -08:00
Colin Cross
7743557a23
Move rust module installation into Soong
...
Move rust module installation rules into Soong by overriding
InstallBypassMake.
Bug: 204136549
Bug: 205530905
Test: m checkbuild
Test: m && acloud create --local-instance --local-image
Change-Id: Icc00c4ea5d91ae489c1d9d3b66a072c9de86c717
2021-11-08 13:31:51 -08:00
Jingwen Chen
a47f28d28e
bp2build: add support for soong_config_module_type.
...
Test: CI, go unit test
Bug: 198556411
Change-Id: Idf862904d51d822f92af0c072341c31b7a02fc64
2021-11-08 13:38:28 +00:00
Baligh Uddin
abca4b2540
[automerger skipped] update allowlist to new path for bluetooth am: 5dd07e514e
am: 3e127a44b3
-s ours
...
am skip reason: Merged-In I53c4d72321c7c0aff589969989b5f1990aa0133c with SHA-1 ce05948197
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883572
Change-Id: I3456f8941e567feeb42dc4a1c67ebdc6e6bfbbcd
2021-11-06 19:00:57 +00:00
Baligh Uddin
3e127a44b3
update allowlist to new path for bluetooth am: 5dd07e514e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883572
Change-Id: I5bc42517684eac56760bc50fa5cde6a2b93b05d2
2021-11-06 18:48:31 +00:00
Baligh Uddin
5dd07e514e
update allowlist to new path for bluetooth
...
BUG: 196026708
Test: TH
Merged-In: I53c4d72321c7c0aff589969989b5f1990aa0133c
Merged-In: Ia511786ea3f47f673d638bdde8581fe0a31a3cc1
Change-Id: I06e125dfa1f063903b5af9b8d37592b9446eb29e
2021-11-06 14:45:48 +00:00
Baligh Uddin
d9d8a3bbbc
Merge "update allowlist to new path for bluetooth" into sc-dev-plus-aosp
2021-11-06 12:48:29 +00:00
Treehugger Robot
59db03fdfe
Merge "Fix location of host tools" am: 7ab37e8903
am: a1d7909e69
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1882953
Change-Id: I1bd5989c5fd6a556a4e71e5d7936f44ab685f771
2021-11-06 00:47:39 +00:00
Treehugger Robot
a1d7909e69
Merge "Fix location of host tools" am: 7ab37e8903
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1882953
Change-Id: I5163f81d6a0fbf620a589e55c88a33a528d9a9fa
2021-11-06 00:29:36 +00:00
Treehugger Robot
7ab37e8903
Merge "Fix location of host tools"
2021-11-06 00:13:56 +00:00
Baligh Uddin
ce05948197
update allowlist to new path for bluetooth
...
BUG: 196026708
Test: TH
Merged-In: Ia511786ea3f47f673d638bdde8581fe0a31a3cc1
Change-Id: I53c4d72321c7c0aff589969989b5f1990aa0133c
2021-11-06 00:03:33 +00:00
Sasha Smundak
35434ed55a
Allow non-constant from/to arguments in subst and patsubst
...
Fixes: 198502623
Test: internal
Change-Id: Ia41a5a2e9315fcce351691749ac15de5df6916a4
2021-11-05 16:30:17 -07:00
sophiez
c92380f001
Add scripts to generate java APIs used by Mainline modules.
...
Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Icd854fd40c3026ae9aae6dc30c9e79027e1303a0
2021-11-05 15:38:09 -07:00
Jooyung Han
07f70c0e92
Pass --min_sdk_version to aidl compiler
...
cc/java modules can have .aidl files as srcs. Pass min_sdk_version to
the aidl compiler so that it can check some features against it.
For example, ParcelableHolder AIDL type is available since 31.
Bug: 205338951
Test: soong test && m
Change-Id: I7ecab913e00c9b6a3ce870dacbe9773d2ddb7e93
2021-11-06 07:31:50 +09:00
Alexander Smundak
e4fe2c58e4
Merge "Fix: negate the condition for is-vendor-board-qcom" am: d8b1998990
am: b6664f5cf9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881869
Change-Id: I4c9524baf3cf718bd952aaa899942abf6f0015f5
2021-11-05 22:05:59 +00:00
Alexander Smundak
b6664f5cf9
Merge "Fix: negate the condition for is-vendor-board-qcom" am: d8b1998990
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881869
Change-Id: Id361da275850d57f854d03bc19b4cbf4596adf29
2021-11-05 21:47:54 +00:00