Commit Graph

34818 Commits

Author SHA1 Message Date
Joanne Chung
342c8bba27 Merge "Revert "Make ConfiguredJarList immutable"" am: 578b5f06c6 am: 1f67171167 am: 7b907ab4eb am: 495a40d67d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475896

Change-Id: Ib65f69eadfc708fc2775768c29abb79bcf6b4553
2020-10-27 06:15:12 +00:00
Joanne Chung
495a40d67d Merge "Revert "Make ConfiguredJarList immutable"" am: 578b5f06c6 am: 1f67171167 am: 7b907ab4eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475896

Change-Id: Id2cfe5fb690ccb21c8149d46455a29389495b83a
2020-10-27 05:59:49 +00:00
Joanne Chung
7b907ab4eb Merge "Revert "Make ConfiguredJarList immutable"" am: 578b5f06c6 am: 1f67171167
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475896

Change-Id: I8da57a661b2921d4730dbf5808859336b8c11ebc
2020-10-27 05:30:33 +00:00
Joanne Chung
1f67171167 Merge "Revert "Make ConfiguredJarList immutable"" am: 578b5f06c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475896

Change-Id: Iaf107b4a2a81672bc4a5c109db30e09acd8b28ae
2020-10-27 05:11:20 +00:00
Inseob Kim
81235ffb96 Set stem and suffix for vndk prebuilt libraries
This is to pass check_elf_files when vendor modules link against vndk
prebuilts. Because of the ".vendor" suffix, the intermediate path
becomes "libfoo.vendor.so" and it makes check_elf_files fail, when stem
and suffix is not specified.

Also, by adding such fields, devices with empty BOARD_VNDK_VERSION can
experience a build break due to collision between VNDK snapshot and VNDK
source module. To completely prevent such collision, all vndk snapshots
become explicitly uninstallable, and they are disabled if
BOARD_VNDK_VERSION is empty.

Test: build/soong/build_test.bash
Change-Id: I54a0f33fd0b84ab9376ee3d75b83113b94bbacae
2020-10-27 14:11:16 +09:00
Treehugger Robot
579c9d3c2f Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: bb0e7034b9 am: cac57cac8a am: e7c9d01017 am: 1df23ad800
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473759

Change-Id: I2014c21f565ae9674e4f98ed877c745a5533bb97
2020-10-27 05:04:42 +00:00
Joanne Chung
578b5f06c6 Merge "Revert "Make ConfiguredJarList immutable"" 2020-10-27 04:57:31 +00:00
Rupert Shuttleworth
6284ceb1f8 Add smoke test for Bazel.
Test: Manually typed the commands in AOSP root.
Change-Id: I5ecf85f9d715f2759d27de4ac18b4928eb306550
2020-10-27 04:56:40 +00:00
Treehugger Robot
1df23ad800 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: bb0e7034b9 am: cac57cac8a am: e7c9d01017
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473759

Change-Id: I99103d89e77ca66f185d15b7b7158612a06cd047
2020-10-27 04:48:37 +00:00
Treehugger Robot
e7c9d01017 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: bb0e7034b9 am: cac57cac8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473759

Change-Id: I120a3215136719c0893dd3b3646ffa60a070e780
2020-10-27 04:21:43 +00:00
Treehugger Robot
cac57cac8a Merge "Cleanup references to system/core/liblog -> system/logging/liblog" am: bb0e7034b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473759

Change-Id: Iffa745157e06738c03edee2b5419ef2384b6084b
2020-10-27 03:45:46 +00:00
Treehugger Robot
bb0e7034b9 Merge "Cleanup references to system/core/liblog -> system/logging/liblog" 2020-10-27 03:33:37 +00:00
Joanne Chung
1f25794e03 Revert "Make ConfiguredJarList immutable"
This reverts commit 052f4727fe.

Reason for revert: Looks to have broken master b/171756871

Change-Id: I6b3b7039c3e3b8ac453734281cb8e7c71b65aed3
2020-10-27 03:22:29 +00:00
Treehugger Robot
37138fc3a1 Merge "Add code to enable USE_BAZEL=1 m functionality in AOSP." am: 38da41c234 am: a762bfd656 am: 60099195ab am: cb0f8421e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473161

Change-Id: I0d625d0d8507b3e75c17de99f3c4307e239aa4bb
2020-10-27 03:00:11 +00:00
Treehugger Robot
e125bb7015 Merge "InstallPath keeps its partition dir" am: f26f734867 am: 34fb35cebc am: 885c4b38a5 am: 8d99ed058c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465916

Change-Id: I74aefaa935b9d2eb335812ca7de960d2be754026
2020-10-27 02:59:52 +00:00
Treehugger Robot
cb0f8421e6 Merge "Add code to enable USE_BAZEL=1 m functionality in AOSP." am: 38da41c234 am: a762bfd656 am: 60099195ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473161

Change-Id: I8bb5fdd7135605c5b50157359f7fba71283b0a8f
2020-10-27 02:30:46 +00:00
Treehugger Robot
8d99ed058c Merge "InstallPath keeps its partition dir" am: f26f734867 am: 34fb35cebc am: 885c4b38a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465916

Change-Id: Ia5f8f03fc01cab8353d69f4db45056cacd473b1e
2020-10-27 02:29:18 +00:00
Treehugger Robot
60099195ab Merge "Add code to enable USE_BAZEL=1 m functionality in AOSP." am: 38da41c234 am: a762bfd656
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473161

Change-Id: Ica5bfee2b071c1a41ec300618a80896a43460971
2020-10-27 02:16:58 +00:00
Treehugger Robot
885c4b38a5 Merge "InstallPath keeps its partition dir" am: f26f734867 am: 34fb35cebc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465916

Change-Id: I94923f49d4eb919954f0e43cfd20b47ba250c3f5
2020-10-27 02:16:45 +00:00
Treehugger Robot
a762bfd656 Merge "Add code to enable USE_BAZEL=1 m functionality in AOSP." am: 38da41c234
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473161

Change-Id: I1825d2db4b6c714ed95b85b806fe935822b22d4c
2020-10-27 02:05:18 +00:00
Treehugger Robot
34fb35cebc Merge "InstallPath keeps its partition dir" am: f26f734867
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465916

Change-Id: Ide1dbc541b5fc0e80db3eaf53c2ab8c042094c73
2020-10-27 02:04:40 +00:00
Treehugger Robot
38da41c234 Merge "Add code to enable USE_BAZEL=1 m functionality in AOSP." 2020-10-27 01:51:38 +00:00
Treehugger Robot
f26f734867 Merge "InstallPath keeps its partition dir" 2020-10-27 01:33:12 +00:00
Baligh Uddin
dfb10dabb9 [automerger skipped] Merge "Cleanup references to system/core/base -> system/libbase" into rvc-d1-dev-plus-aosp am: 48674ada35 am: b655c188a0 -s ours
am skip reason: Change-Id I4ca92160a2572144a24e26e8999794f297073793 with SHA-1 818f52fa1a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12918081

Change-Id: Ied1ec838bb751e24601850a9a6aeac93a5af7037
2020-10-26 23:25:27 +00:00
Baligh Uddin
b655c188a0 Merge "Cleanup references to system/core/base -> system/libbase" into rvc-d1-dev-plus-aosp am: 48674ada35
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12918081

Change-Id: I0f22f14a55c6b268ed81c62a5cfbdff34bc0de9f
2020-10-26 23:12:53 +00:00
Baligh Uddin
48674ada35 Merge "Cleanup references to system/core/base -> system/libbase" into rvc-d1-dev-plus-aosp 2020-10-26 22:31:13 +00:00
Baligh Uddin
cc2ad7f94a Cleanup references to system/core/base -> system/libbase
BUG: 157656545
Test: TH
Exempt-From-Owner-Approval: Cleanup CL (Comments)
Merged-In: I4ca92160a2572144a24e26e8999794f297073793
Change-Id: I7ae9c974d92402f3f2e510eefb4d314dd497505e
2020-10-26 22:29:58 +00:00
Paul Duffin
f63c3b4925 Merge "Make ConfiguredJarList immutable" am: e1878c101d am: 7ad2fa969b am: 89e8d18655 am: 8df961a826
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471776

Change-Id: Ia35aa8e42f0a88f6182ac6aa0e91ce1b204c23cf
2020-10-26 21:28:28 +00:00
Paul Duffin
8a6c0fe6cd Merge "Remove unnecessary ConfiguredJarList.apex(int) method" am: 728e626cb6 am: fc383ac1bd am: e7122d9e88 am: 60b9747bc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471774

Change-Id: I520e5a97131df87188fc55cc7c6f4352108c6019
2020-10-26 21:28:15 +00:00
Paul Duffin
8df961a826 Merge "Make ConfiguredJarList immutable" am: e1878c101d am: 7ad2fa969b am: 89e8d18655
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471776

Change-Id: I67c890408cc0d1029420350e54dc3959a75e7fb8
2020-10-26 21:17:06 +00:00
Paul Duffin
60b9747bc5 Merge "Remove unnecessary ConfiguredJarList.apex(int) method" am: 728e626cb6 am: fc383ac1bd am: e7122d9e88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471774

Change-Id: I35f89911ae3a08107514f7f44ee92ab2d1175f0b
2020-10-26 21:15:36 +00:00
Paul Duffin
89e8d18655 Merge "Make ConfiguredJarList immutable" am: e1878c101d am: 7ad2fa969b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471776

Change-Id: I4c576b36ac41c499c7576d730aeffab54721fb0b
2020-10-26 20:46:36 +00:00
Paul Duffin
e7122d9e88 Merge "Remove unnecessary ConfiguredJarList.apex(int) method" am: 728e626cb6 am: fc383ac1bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471774

Change-Id: I78277445c16299b88863760af7ddb303758a70cd
2020-10-26 20:46:31 +00:00
Treehugger Robot
08ceacd2a9 Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e am: 1cca112b7e am: 4841f43044 am: e1df571026
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: I271cc80f96386126ed98158ba0dc7993ba3d4451
2020-10-26 20:46:19 +00:00
Paul Duffin
7ad2fa969b Merge "Make ConfiguredJarList immutable" am: e1878c101d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471776

Change-Id: Id65ff40ef8298f7089b9d5224d29779085b171b6
2020-10-26 20:34:46 +00:00
Treehugger Robot
e1df571026 Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e am: 1cca112b7e am: 4841f43044
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: I129669c9c71805658989352d448db64cdaada08e
2020-10-26 20:33:22 +00:00
Paul Duffin
fc383ac1bd Merge "Remove unnecessary ConfiguredJarList.apex(int) method" am: 728e626cb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471774

Change-Id: If554814e2e947c108b4da518211ae0009791b2f8
2020-10-26 20:33:20 +00:00
Paul Duffin
e1878c101d Merge "Make ConfiguredJarList immutable" 2020-10-26 20:14:02 +00:00
Paul Duffin
728e626cb6 Merge "Remove unnecessary ConfiguredJarList.apex(int) method" 2020-10-26 20:13:45 +00:00
Treehugger Robot
4841f43044 Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e am: 1cca112b7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: Ib17d4d5f5a04ddf402acb596bdd766c334e652fb
2020-10-26 20:05:42 +00:00
Treehugger Robot
1cca112b7e Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: I7a7e71b7bf11abe7dacaaf090d2b5850d24d77c0
2020-10-26 19:57:45 +00:00
Yifan Hong
39143a941f Fix path conflict for vendor_ramdisk_available
... and ramdisk_available modules. If a module is both
vendor_ramdisk_available and ramdisk_available, on a device
that mark recovery_as_boot and move_recovery_resources_to_vendor_boot
simultaneously (and incorrectly),
both will be installed to recovery/root/first_stage_ramdisk. Fix the
path conflict of the two variants by moving the vendor_ramdisk variant
to vendor-ramdisk/first_stage_ramdisk instead.

Also update comments for Vendor_ramdisk_available.

Test: m nothing -j
Bug: 156098440

Change-Id: I2b776b6fd8f5a2c361c0f6a89231e3cebc2646f0
2020-10-26 12:50:05 -07:00
Treehugger Robot
93d8c6443e Merge "Add libdmabufheap to the list of allowed dependencies" 2020-10-26 19:31:57 +00:00
Paul Duffin
052f4727fe Make ConfiguredJarList immutable
By making the Append and RemoveList methods return a new list instead
of modifying the existing list it makes the ConfiguredJarList usages
easier to reason about and safer to use, especially considering that
they are primarily used in global configuration.

Bug: 171479578
Test: m nothing
Change-Id: I102c4fb42f0c54e4ed299d2921fbf5efeb6e99b9
2020-10-26 15:57:11 +00:00
Paul Duffin
1e8c6072bb Remove unnecessary ConfiguredJarList.apex(int) method
This is only used from within the ConfiguredJarList implementation and
provides no real benefit over directly accessing the apexes slices.
Similarly, uses of Jar(int) from within the implementation are also
replaced with direct slice access.

Bug: 171479578
Test: m nothing
Change-Id: I7e799b1049f4a1da4140e55831c4559751278de6
2020-10-26 15:26:41 +00:00
Baligh Uddin
637df8e206 Cleanup references to system/core/liblog -> system/logging/liblog
BUG: 170387172
Test: TH
Change-Id: I08053d29beacb0a5c9a4d30443fe6086ce52f83e
2020-10-26 14:34:53 +00:00
Baligh Uddin
a9c12f8a47 Merge "Cleanup references to system/core/base -> system/libbase" 2020-10-26 14:00:07 +00:00
Baligh Uddin
818f52fa1a Cleanup references to system/core/base -> system/libbase
BUG: 157656545
Test: TH
Exempt-From-Owner-Approval: Cleanup comment
Change-Id: I4ca92160a2572144a24e26e8999794f297073793
2020-10-26 13:19:44 +00:00
Anton Hansson
52ac73d21e Make highmem classification of metalava optional
We have added a lot of metalava invocations since the highmem
differentation was added, most of which do not use a lot of memory.

By collecting data of max rss per process we have narrowed down
the set of highmem modules to a smaller set, and will annotate the
relevant modules as such.

Bug: 170701554
Test: NINJA_HIGHMEM_NUM_JOBS=3 m checkapi (no long tail of metalava)
Change-Id: Ic9c8c91388b02889111ef596fc6fd8bde9b42b9d
2020-10-26 11:38:40 +00:00
Mathew Inwood
9b8c1a54b0 Merge "Tag removed APIs as such in hiddenapi_flags.csv." am: 1e8118da95 am: 6123adab59 am: 1f4b17f49e am: f36f496c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469622

Change-Id: I9af52d5b97eefe04dc7cf81127c219d1ecf0799a
2020-10-26 11:02:21 +00:00