Commit graph

30642 commits

Author SHA1 Message Date
Paul Duffin
dddc036bd1 Revert "Enable mainline prebuilts on tm-dev branch."
This reverts commit de9f0b12f1.

Reason for revert: breaks build_test and build_test2 on git_tm-dev.

Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.

Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
2022-05-21 00:17:09 +00:00
Dario Freni
de9f0b12f1 Enable mainline prebuilts on tm-dev branch.
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Change-Id: Ibc3ea584b95f8186c63e29f71b5164451dc433cd
2022-05-20 11:40:39 +00:00
Steve Berbary
4dba876f41 Update Security String to 2022-07-05 am: e359b90082
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356643

Change-Id: I79b195940e52d9ec1b6c8fa77b63b880a7b1a894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:43 +00:00
Steve Berbary
e359b90082 Update Security String to 2022-07-05
Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
2022-05-12 18:49:14 +00:00
Yurii Zubrytskyi
5e3cd45b5c Merge "RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL" into tm-dev 2022-05-07 15:11:19 +00:00
Yurii Zubrytskyi
f1687f9848 RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL
Bug: 225745567
Test: Build
Change-Id: I9efa0b919e15bb2f55054ae0d59f53f572ba87cd
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
2022-05-02 23:16:08 +00:00
Inseob Kim
788648f63f Add PLATFORM_VERSION_LAST_STABLE to soong config
Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
Merged-In: Iec36d22af80225f6da848bae1e02d263ff957df8
(cherry picked from commit a59b4dcd33)
2022-05-02 09:52:26 +09:00
Treehugger Robot
63ff2c20f7 Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b am: 75e70bef8b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I13a3ffed760f9a4fafa1062c38726070265940e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:58:57 +00:00
Treehugger Robot
75e70bef8b Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I8d1b2d6c0f8af8cc89de10bd989fbe6cf95a5623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:35:06 +00:00
Treehugger Robot
e1da8fe40b Merge "Declare license metadata for copied files." am: d7856b74dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I70ce9aef9791a18081e989134eadfcb9d20ea5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:19:14 +00:00
Treehugger Robot
d7856b74dc Merge "Declare license metadata for copied files." 2022-04-20 23:58:24 +00:00
Ivan Lozano
7a9900a3ae Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787 am: 3dba55b9cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I46d86fd10c8265ce16c17110e67a94c276f5a9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:20 +00:00
Ivan Lozano
3dba55b9cd Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I222a9d507d31020ee33f3f519bf8b886c837243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:03:20 +00:00
Bob Badour
540a3f8ec1 Declare license metadata for copied files.
Bug: 151177513

Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Ivan Lozano
2f619a0787 Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: Ica503d11bee5a8083e9138b90f912023f3510a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:33:45 +00:00
Treehugger Robot
2763773a1a Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b am: abd53cb613
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I677bde0d9c73f19a2631d2938c8826d949f1731b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:36 +00:00
Ivan Lozano
6689f3889e Merge "rust: Add proc_macro NOTICE files" 2022-04-20 19:21:25 +00:00
Treehugger Robot
abd53cb613 Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: Iadc5b89a256454e009f886ffe34fcae335296f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:56:36 +00:00
Treehugger Robot
7137e03c4b Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I916fe02c73158a4563c8e3ad6cc8f092a2015fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
8a6fa9c7c5 Merge "Allow init_rc files to be installed in ramdisk" 2022-04-20 18:07:17 +00:00
Trevor Radcliffe
d3325d15ce Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa am: eaaae159bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Ia79235faba34f3f16fa84415dc8ac5d42cbd662b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:42:57 +00:00
Trevor Radcliffe
eaaae159bc Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Iaecb70a18e68e9082d40d7debf129b7554cf391f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:18:09 +00:00
Trevor Radcliffe
7cecfb7ffa Merge "Add comment for previous CL" am: 1e63a893dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: I54647f88cee8a17d2b2aee5f58ec4de6a284e6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:24 +00:00
Trevor Radcliffe
1e63a893dc Merge "Add comment for previous CL" 2022-04-20 14:16:22 +00:00
Treehugger Robot
9f99087283 Merge "Correct abspath implementation" am: 9ec1a7aa72 am: fcae811f2c am: 3033cc5982
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Ie2fac8474be0853fca2820f9e38f90cb91412216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:24:35 +00:00
Treehugger Robot
f585c50d8e Merge "Sort inherited products correctly" am: 0339142a27 am: 188e38ecd4 am: 8444f7fddf
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: If2785c4848682aca5dbc2dea7c37793434119cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:23:03 +00:00
Colin Cross
bc28181e3d Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de am: b8999c3d88 am: 1e492a67d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I47ac1a65c04c32666535e20c44f989921e013577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:21:19 +00:00
Treehugger Robot
7ec455ad93 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8 am: 1a73e98758
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:03:43 +00:00
Treehugger Robot
3033cc5982 Merge "Correct abspath implementation" am: 9ec1a7aa72 am: fcae811f2c
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Ifa14038d168b893001b453da41f3c4d83e8c6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:51 +00:00
Treehugger Robot
8444f7fddf Merge "Sort inherited products correctly" am: 0339142a27 am: 188e38ecd4
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: Ie7c7dcdf981dd04e573cef42aea1a7c0f1066fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:42 +00:00
Treehugger Robot
fcae811f2c Merge "Correct abspath implementation" am: 9ec1a7aa72
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Id0156874a096036a515913c13406cef823f148d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:48:43 +00:00
Treehugger Robot
188e38ecd4 Merge "Sort inherited products correctly" am: 0339142a27
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: I174012ee8ba083b825825b8b0f616c3f7eb2413d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:48:33 +00:00
Treehugger Robot
9ec1a7aa72 Merge "Correct abspath implementation" 2022-04-20 01:32:16 +00:00
Treehugger Robot
0339142a27 Merge "Sort inherited products correctly" 2022-04-20 01:09:36 +00:00
Colin Cross
1e492a67d2 Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de am: b8999c3d88
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I59452bfd60967db2cc8a7e097e044b90f5479e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:49:54 +00:00
Cole Faust
426c7441b0 Correct abspath implementation
realpath doesn't return a path if the file doesn't exist,
but $(abspath) in make does.

Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ief7f634024cc52a9e8c5e478666b15512512f0d8
2022-04-19 14:46:09 -07:00
Colin Cross
b8999c3d88 Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I42de27dd63ccccad7255da0422d9194a510c0f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:11:05 +00:00
Colin Cross
845e23b0de Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" 2022-04-19 20:52:39 +00:00
Treehugger Robot
1a73e98758 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: If7455d464bdbaeb8917704678e7d23c7a9ca7583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:04:55 +00:00
Treehugger Robot
fa33ae6ff8 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I6437f6be96ed0013dc6e8cbc0bda018fa6ca3574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 16:39:15 +00:00
Bowgo Tsai
85578e0a9d Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.

The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.

Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
2022-04-19 17:57:51 +08:00
Cole Faust
d370a3f7bd Sort inherited products correctly
We pass the filename without the extension to
rblf.inherit(). Removing the extension changes the
sort order when one file's name is a prefix of another:

```
>>> sorted(["base", "base-secondary"])
['base', 'base-secondary']
>>> sorted(["base.mk", "base-secondary.mk"])
['base-secondary.mk', 'base.mk']
```

Correct the sort order so that global variables get
their correct ordering.

Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I22367eb49b33956b71ac1b966fe78c1308b94257
2022-04-18 17:18:08 -07:00
Cole Faust
401af25546 Merge "Implement abspath" am: a9aa002d3b am: bc0c150831 am: a6ea980936
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: I9aefb9269330f3e7196e3501ec90acaff029955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:35:00 +00:00
Cole Faust
a6ea980936 Merge "Implement abspath" am: a9aa002d3b am: bc0c150831
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: Ib32425125c2e6554fbf36f1496047d89e912b5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:14:13 +00:00
Cole Faust
bc0c150831 Merge "Implement abspath" am: a9aa002d3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: I1d3870beed4989bc3cc1fa3671c9f5cdb2169b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 21:44:24 +00:00
Cole Faust
a9aa002d3b Merge "Implement abspath" 2022-04-18 21:26:40 +00:00
Colin Cross
85722b807a Put javac, d8 and r8 rules into RBE ninja pool, take two
I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6 attempted to put the javac,
d8 and r8 rules into the RBE ninja pool so they could run 500 jobs
in parallel, but rbe.mk is not parsed during the main build phase
and the pool continued to be unset.  Move the pool configuration
into config.mk.

Bug: 228603472
Test: manual
Change-Id: I56377244e1c496034576ba5988393d88c2c5b09f
2022-04-18 12:10:33 -07:00
Ivan Lozano
5880e85a0f rust: Add proc_macro NOTICE files
Collect NOTICE files from proc-macros in a similar fashion to static
libraries.

Test: m
Change-Id: Id8ef8d74c8e0ea6ce3c137231b41addcb763876d
2022-04-18 15:03:37 -04:00
Sam Saccone
70dbe365fd Merge "Do not compress zip file for unit tests." am: 6337ed39e1 am: d03bb4ff75 am: cc8ad353fd
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641

Change-Id: I5164683cbc32a2b597e0f87d5c63af38789b1aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:32:57 +00:00
Sam Saccone
cc8ad353fd Merge "Do not compress zip file for unit tests." am: 6337ed39e1 am: d03bb4ff75
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641

Change-Id: I986e79ae1701dec4df99b1d87096c41e9bc3b650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:13:44 +00:00