Commit Graph

48251 Commits

Author SHA1 Message Date
Sophie Zheng
a31ea43aaa Merge "Java APIs used by Mainline modules." am: 7b5fa4277f am: 2a27e47fbd am: 587dbb8553
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: Ib0a9ac8109b77d4d4f89e76a56d709be3b896d9b
2021-11-15 07:21:31 +00:00
Sophie Zheng
587dbb8553 Merge "Java APIs used by Mainline modules." am: 7b5fa4277f am: 2a27e47fbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: Ib3f754da073ba46ec146ec1355111f3b06431857
2021-11-15 07:11:05 +00:00
Sophie Zheng
2a27e47fbd Merge "Java APIs used by Mainline modules." am: 7b5fa4277f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: I2af77f52c7d56b7dccdf83d19cb0121aa648b3d7
2021-11-15 06:59:16 +00:00
Sophie Zheng
7b5fa4277f Merge "Java APIs used by Mainline modules." 2021-11-15 06:40:31 +00:00
Colin Cross
df95450b97 Merge "Mark vndkLibrariesTxt modules as device modules" am: cb16a92ee4 am: 4c05008f42 am: 5b8c857f9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889921

Change-Id: I0741994909386db56203b36d328eb92410c13c05
2021-11-13 00:21:39 +00:00
Colin Cross
5b8c857f9a Merge "Mark vndkLibrariesTxt modules as device modules" am: cb16a92ee4 am: 4c05008f42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889921

Change-Id: I447133901a15b683e838752824310e011e9d9085
2021-11-13 00:03:34 +00:00
Colin Cross
4c05008f42 Merge "Mark vndkLibrariesTxt modules as device modules" am: cb16a92ee4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889921

Change-Id: I3487c58d6f641773558b3720941f8a894efa762a
2021-11-12 23:46:10 +00:00
sophiez
0234737f30 Java APIs used by Mainline modules.
Add scripts to generate java APIs used by Mainline modules. This is
aosp/1879177 with fixed build error that caused by dexdeps analyzing
resource only APKs which doesn't contains any .dex files. Now skip the
error generates in that case in gen_java_usedby_apex.sh

Forrest run:https://android-build.googleplex.com/builds/abtd/run/L38900000951898586

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Id539cbe1b7306ace69c047f95ffc02265a467511
2021-11-12 23:39:35 +00:00
Colin Cross
cb16a92ee4 Merge "Mark vndkLibrariesTxt modules as device modules" 2021-11-12 23:30:51 +00:00
Treehugger Robot
d3d5ae6f85 Merge "Allow open-dice to build tests for generatied open-dice rust bindings." am: 70275c031e am: 350f901177 am: 9f1d3244a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890803

Change-Id: I4fe98e2b49bac702ca49596cd60ddd6510f8181b
2021-11-12 21:29:49 +00:00
Treehugger Robot
9f1d3244a8 Merge "Allow open-dice to build tests for generatied open-dice rust bindings." am: 70275c031e am: 350f901177
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890803

Change-Id: I9f9e13852d832f49256aa558dfaa460f7b7f58d1
2021-11-12 21:14:28 +00:00
Treehugger Robot
350f901177 Merge "Allow open-dice to build tests for generatied open-dice rust bindings." am: 70275c031e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890803

Change-Id: If1966448b218ccd38f20241294ccc3f320c8114d
2021-11-12 20:57:42 +00:00
Treehugger Robot
70275c031e Merge "Allow open-dice to build tests for generatied open-dice rust bindings." 2021-11-12 20:38:53 +00:00
Janis Danisevskis
73f2104588 Allow open-dice to build tests for generatied open-dice rust bindings.
Test: N/A
Bug: 205626417
Change-Id: Iafa79f07005b9863468252828c74ee199279c457
2021-11-12 20:33:49 +00:00
Ivan Lozano
b59ff25b26 Merge "rust: Support new rust_stdlib_prebuilt_host type" am: 52a3e36c92 am: 00713727b7 am: a1c2b474fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888868

Change-Id: I1950f70bc8171ea9d92c99686fa9fadebb2e6191
2021-11-12 20:13:54 +00:00
Ivan Lozano
865f0689b2 Merge changes I26198187,Ia904d07b am: 94e8a651fa am: b84c426099 am: a6426b8e64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877339

Change-Id: Iee77078009aacb63fb67b557b94ac6f1d5566a66
2021-11-12 20:13:40 +00:00
Ivan Lozano
a1c2b474fa Merge "rust: Support new rust_stdlib_prebuilt_host type" am: 52a3e36c92 am: 00713727b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888868

Change-Id: I1ba20556de79d96c89c30cf49658290fb70bab93
2021-11-12 20:02:32 +00:00
Ivan Lozano
a6426b8e64 Merge changes I26198187,Ia904d07b am: 94e8a651fa am: b84c426099
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877339

Change-Id: Ib7c74cc2e39d1e52391ca1033733a192faff09a7
2021-11-12 20:02:18 +00:00
Ivan Lozano
00713727b7 Merge "rust: Support new rust_stdlib_prebuilt_host type" am: 52a3e36c92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888868

Change-Id: I4a554b7dfd9827a9c65ebf31e099c5de6d5a75a2
2021-11-12 19:50:08 +00:00
Cole Faust
a47bdcc0d6 Merge "Convert soong scripts to python 3" am: 4220a61349 am: 5abf961c8d am: 44e9059989
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886447

Change-Id: Ifb6df116bdc18acdafd513f9e0de01ea27bbe2df
2021-11-12 19:49:55 +00:00
Colin Cross
21d7f625c3 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf am: ca03de2828
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: I98649c0cdd9929aac0b90814e287a05ce20dadd0
2021-11-12 19:49:50 +00:00
Cole Faust
62643010df Merge "Make handleSimpleStatement also handle if statements" am: 80374405df am: 9585062240 am: 07881dd311
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I95d675e5807e309ec0f23bf4ccab56b581820d3c
2021-11-12 19:49:42 +00:00
Ivan Lozano
b84c426099 Merge changes I26198187,Ia904d07b am: 94e8a651fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877339

Change-Id: I07a8f5583e867b0c395ec42540ea8448a2bc6a2c
2021-11-12 19:45:01 +00:00
Ivan Lozano
52a3e36c92 Merge "rust: Support new rust_stdlib_prebuilt_host type" 2021-11-12 19:35:03 +00:00
Cole Faust
44e9059989 Merge "Convert soong scripts to python 3" am: 4220a61349 am: 5abf961c8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886447

Change-Id: I4261b1abb4ab2f9666d41b6b2b4d552fdc112c8f
2021-11-12 19:32:27 +00:00
Colin Cross
ca03de2828 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Ia95002049419f7d59278da517bd41b3b80050823
2021-11-12 19:32:21 +00:00
Cole Faust
07881dd311 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df am: 9585062240
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: Ic2a6405aee1570ba055da576cca3ec9c55466cf3
2021-11-12 19:32:14 +00:00
Ivan Lozano
94e8a651fa Merge changes I26198187,Ia904d07b
* changes:
  rust: Support MTE memtag_heap sanitizer
  rust: Support global sanitizers
2021-11-12 19:26:04 +00:00
Cole Faust
5abf961c8d Merge "Convert soong scripts to python 3" am: 4220a61349
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886447

Change-Id: I4c51bb28214d384e8f66b5cba92c71897604912a
2021-11-12 19:15:17 +00:00
Colin Cross
35ee47dcbf Merge "Revert "Move apex module installation into Soong"" am: 152911f807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Iaa000333e09fd0a87738c66709f4c390f80a36b4
2021-11-12 19:15:13 +00:00
Cole Faust
9585062240 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I1e05d7e665ae80d657d7a67556749072fc8731e9
2021-11-12 19:15:06 +00:00
Cole Faust
4220a61349 Merge "Convert soong scripts to python 3" 2021-11-12 19:04:31 +00:00
Colin Cross
152911f807 Merge "Revert "Move apex module installation into Soong"" 2021-11-12 19:02:30 +00:00
Cole Faust
80374405df Merge "Make handleSimpleStatement also handle if statements" 2021-11-12 19:01:41 +00:00
Colin Cross
ccba23db44 Revert "Move apex module installation into Soong"
This reverts commit e3d156a622.

Reason for revert: b/206119621

Bug: 204136549
Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02
Fixes: 206119621
2021-11-12 19:01:29 +00:00
Colin Cross
2098ff63f4 Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9 am: f24e7a7f4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I73773ae16a33399c367028b933792fde1030ff0b
2021-11-12 17:56:22 +00:00
Colin Cross
f24e7a7f4e Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I984d3ce684154b0089c16fc0689ef035e2a1d3d1
2021-11-12 17:38:41 +00:00
Colin Cross
8dfdabc4c9 Merge "Move apex module installation into Soong" am: 4e278e5f68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I152ae7b450c21f0e6c5839cc7f52f9ae2fb1b457
2021-11-12 17:21:00 +00:00
Colin Cross
45bce85fc9 Mark vndkLibrariesTxt modules as device modules
vndkcorevariant.libraries.txt needs to be installed onto the device,
mark the vndkLibrariesTxt module type as a device module so that
PathForModuleInstall returns a path in the system partition.

Bug: 204136549
Test: m checkbuild
Change-Id: Ic2aadff27cee6a5e6352ceaf61b707ad3e5b531f
2021-11-12 09:12:22 -08:00
Colin Cross
4e278e5f68 Merge "Move apex module installation into Soong" 2021-11-12 17:06:08 +00:00
Ivan Lozano
fba2aa255c rust: Support new rust_stdlib_prebuilt_host type
Refactor Rust prebuilts to support the new rust_stdlib_prebuilt_host
module type, and change the format for depending on the prebuilt host
stdlibs.

Bug: 140642453
Test: m
Change-Id: Ifbc4741818777934e917631c788b20911856c44a
2021-11-12 08:58:17 -05:00
Colin Cross
a3a2a61ea0 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0 am: dbeb6b2eb7 am: 4733a58a28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: Ib63670f59320187fddddc609fbde75ba66a68bed
2021-11-12 08:02:45 +00:00
Colin Cross
4733a58a28 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0 am: dbeb6b2eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I5b32c398019aa9457a139703c7f509adfbdccbfd
2021-11-12 07:43:56 +00:00
Colin Cross
dbeb6b2eb7 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I959165bef217b86ff099592dad47f5f9291fc408
2021-11-12 07:27:41 +00:00
Colin Cross
8432238aa0 Merge "Add .PHONY for dist-for-goals targets" 2021-11-12 07:13:17 +00:00
Alexander Smundak
ca5f81e12b Merge "Display diagnostic message for each conversion error." am: 51977fca61 am: 406e121088 am: e12051ee3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: Icdb33de11f20ef14248f642741d7e4e779b5a321
2021-11-12 03:21:35 +00:00
Alexander Smundak
e12051ee3e Merge "Display diagnostic message for each conversion error." am: 51977fca61 am: 406e121088
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I1452fe33633fe7ade33cfcd8247959d98025eefd
2021-11-12 03:08:42 +00:00
Alexander Smundak
406e121088 Merge "Display diagnostic message for each conversion error." am: 51977fca61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I5115ea8a41e0a338796939d928dcf0b1688a20a0
2021-11-12 02:50:58 +00:00
Alexander Smundak
51977fca61 Merge "Display diagnostic message for each conversion error." 2021-11-12 02:34:39 +00:00
Treehugger Robot
71f55ca534 Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494 am: 4f80ea196b am: 5fb59ee67c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: I7d0515b3b5558bdea1cd07079c5b46b5d7112d2f
2021-11-12 01:49:47 +00:00