Commit graph

66952 commits

Author SHA1 Message Date
Steve Muckle
0fcb904e0f Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840 am: c9eefe4ad2 am: e468a9fd20
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: I0b0c37733e3a71869ddd5be6b50bdfa099880eac
2020-10-12 01:54:52 +00:00
Steve Muckle
e468a9fd20 Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840 am: c9eefe4ad2
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: I69a16b64717049803bb36bc1dbe5ae0f320e38c3
2020-10-12 01:44:00 +00:00
Steve Muckle
c9eefe4ad2 Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: Ic014ca1905bb2f907e58861f786e2238bf565af4
2020-10-12 01:30:23 +00:00
Steve Muckle
4231172840 Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: Ib40d6954000df09d7fba80f7ab387bb87bd82374
2020-10-12 01:10:08 +00:00
Steve Muckle
a5e1dc4b1c Merge "Revert^2 "use new GKI kernel location"" 2020-10-12 00:42:56 +00:00
Yifan Hong
695a827b0b Merge "Build otatools files before building OTA packages." am: 49ccbb3729 am: e5491533ae am: 97abaede42 am: 6ff29067a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1455215

Change-Id: I7c63c8148771823b92bc3b913490ecdb0cbb35e3
2020-10-09 19:22:24 +00:00
Yifan Hong
6ff29067a3 Merge "Build otatools files before building OTA packages." am: 49ccbb3729 am: e5491533ae am: 97abaede42
Original change: https://android-review.googlesource.com/c/platform/build/+/1455215

Change-Id: Idc53a74c335b446907300b6bbb6661cd08197a38
2020-10-09 19:09:37 +00:00
Treehugger Robot
3f0ccd4701 Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417 am: 2f7b994a6f am: c2b2a519c5 am: fdad123a3d
Original change: https://android-review.googlesource.com/c/platform/build/+/1453726

Change-Id: I6042bc6b0d1f25beac78e025d5f9b977138c7cea
2020-10-09 19:01:56 +00:00
Yifan Hong
97abaede42 Merge "Build otatools files before building OTA packages." am: 49ccbb3729 am: e5491533ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1455215

Change-Id: Ic220fc582739c513363f152857f99f8713aebe68
2020-10-09 18:57:13 +00:00
Treehugger Robot
fdad123a3d Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417 am: 2f7b994a6f am: c2b2a519c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1453726

Change-Id: Icafde80cf1dba59b7f2d072438a2e1acd1231bcb
2020-10-09 18:41:29 +00:00
Yifan Hong
e5491533ae Merge "Build otatools files before building OTA packages." am: 49ccbb3729
Original change: https://android-review.googlesource.com/c/platform/build/+/1455215

Change-Id: I51c0c0b8753ebcae7555fb6a72c1d7eaa2255338
2020-10-09 18:34:24 +00:00
Treehugger Robot
c2b2a519c5 Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417 am: 2f7b994a6f
Original change: https://android-review.googlesource.com/c/platform/build/+/1453726

Change-Id: Ib224b45b354efc77597252d8c2158ad93e94d91e
2020-10-09 18:08:06 +00:00
Yifan Hong
49ccbb3729 Merge "Build otatools files before building OTA packages." 2020-10-09 18:06:43 +00:00
Treehugger Robot
2f7b994a6f Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417
Original change: https://android-review.googlesource.com/c/platform/build/+/1453726

Change-Id: Id39b7eab3c5ed08b98aa1766991b08ab7898018e
2020-10-09 17:56:30 +00:00
Treehugger Robot
9b7cce9417 Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." 2020-10-09 17:37:39 +00:00
Steve Muckle
0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Pete Bentley
bebf62c402 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105 am: c8acaa6f82 am: a8fb0f2d0d am: ccd5bc2b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I5b3635143544c618a19a149b11bba868a5ce97e1
2020-10-09 12:04:31 +00:00
Pete Bentley
ccd5bc2b1c Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105 am: c8acaa6f82 am: a8fb0f2d0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I1d3e122e7069546c0dff3c71a4d354a55a427c73
2020-10-09 11:50:42 +00:00
Pete Bentley
a8fb0f2d0d Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105 am: c8acaa6f82
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: Ief7a66945b5f80389b5d2e3380c614afcd2f7971
2020-10-09 11:05:32 +00:00
Pete Bentley
c8acaa6f82 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I98a383e302f881b149fb8aba245f4463e386f362
2020-10-09 10:44:26 +00:00
Pete Bentley
f00bfe0105 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" 2020-10-09 10:22:30 +00:00
Xiao Ma
92e18d10ae Merge "Revert "use new GKI kernel location"" am: f07902e84f am: 677a13713c am: b60960d28b am: b236cef699
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I09f00e5483ced47fd10280f7c7a718472e81fc42
2020-10-09 09:05:52 +00:00
Xiao Ma
b236cef699 Merge "Revert "use new GKI kernel location"" am: f07902e84f am: 677a13713c am: b60960d28b
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I02e4eb75b468c8e96c1863058d2d342c9b883ce1
2020-10-09 08:48:28 +00:00
Pete Bentley
4c9c891fc4 Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so
An ABI incompatible change along with inability to
express the JNI dependency can result in build failures, see
b/170311371#comment8 for how to reproduce.  Tested by using that
repro and verifying this clean step fixes it.  Hopefully the
path being removed is correct for all host platforms.

Fixes: 170311371
Bug: 170389375
Test: As described above
Change-Id: I95ea952bf31d8e9caa8c42d21f2db1968cbe9097
2020-10-09 08:42:13 +00:00
Xiao Ma
b60960d28b Merge "Revert "use new GKI kernel location"" am: f07902e84f am: 677a13713c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I3bf4583b62969d2b2ae15b9a4d0b1afb3bb80696
2020-10-09 08:03:13 +00:00
Xiao Ma
677a13713c Merge "Revert "use new GKI kernel location"" am: f07902e84f
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I7a60291d250bfd1b797036c9eb20c2e04dba9b21
2020-10-09 07:49:45 +00:00
Xiao Ma
f07902e84f Merge "Revert "use new GKI kernel location"" 2020-10-09 07:35:33 +00:00
Xiao Ma
a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle
b5187faf37 Merge "use new GKI kernel location" am: 1d83969db8 am: b3f99cd4cd am: 4e0897d57c am: 0957ed5e4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: Icc6db4538379ca5413c3a907122d05721060e299
2020-10-09 07:01:06 +00:00
Steve Muckle
0957ed5e4b Merge "use new GKI kernel location" am: 1d83969db8 am: b3f99cd4cd am: 4e0897d57c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: I5b5f8f864f5d62419a3bd536e0ff638e3aa6df89
2020-10-09 06:35:05 +00:00
Steve Muckle
4e0897d57c Merge "use new GKI kernel location" am: 1d83969db8 am: b3f99cd4cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: Id85c1bd7e884be34973b71fae2cc18e744f975c8
2020-10-09 06:20:17 +00:00
Joe Onorato
e0b62f5392 Merge "Refactor OWNERS files in platform/build/make." am: f09dce28d3 am: 871d07c67d am: 3e40a3a26a am: 492459ca54
Original change: https://android-review.googlesource.com/c/platform/build/+/1455497

Change-Id: Iae6f6983db00df2b8acb257e33a30a2ec7ac6087
2020-10-09 06:15:53 +00:00
Dan Shi
a4e7f0c64c Merge "Add missing target-native-copy-pairs util" am: a98b188e50 am: f6e0927f4a am: d3f62629ba am: 268ed3ed1b
Original change: https://android-review.googlesource.com/c/platform/build/+/1455016

Change-Id: If746427dd3b8a7a4db3127ade44b067e41147ae6
2020-10-09 06:15:37 +00:00
Steve Muckle
b3f99cd4cd Merge "use new GKI kernel location" am: 1d83969db8
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: I9c5af9cf064f3672e51736f2194b834162f3d993
2020-10-09 06:05:16 +00:00
Steve Muckle
1d83969db8 Merge "use new GKI kernel location" 2020-10-09 05:34:46 +00:00
Joe Onorato
492459ca54 Merge "Refactor OWNERS files in platform/build/make." am: f09dce28d3 am: 871d07c67d am: 3e40a3a26a
Original change: https://android-review.googlesource.com/c/platform/build/+/1455497

Change-Id: I96185489ac6d6e5a42095a83fdc652e420f3e968
2020-10-09 05:13:11 +00:00
Joe Onorato
3e40a3a26a Merge "Refactor OWNERS files in platform/build/make." am: f09dce28d3 am: 871d07c67d
Original change: https://android-review.googlesource.com/c/platform/build/+/1455497

Change-Id: If76efb5048a9764f00c3528855b5d377c7c91817
2020-10-09 04:59:32 +00:00
Dan Shi
268ed3ed1b Merge "Add missing target-native-copy-pairs util" am: a98b188e50 am: f6e0927f4a am: d3f62629ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1455016

Change-Id: I562ce0d076a25cb96525ea2ba6a264efd2918a7a
2020-10-09 04:56:18 +00:00
Joe Onorato
871d07c67d Merge "Refactor OWNERS files in platform/build/make." am: f09dce28d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1455497

Change-Id: I40d89146d7b8b06f215c007e2f160266a3259f70
2020-10-09 04:45:30 +00:00
Dan Shi
d3f62629ba Merge "Add missing target-native-copy-pairs util" am: a98b188e50 am: f6e0927f4a
Original change: https://android-review.googlesource.com/c/platform/build/+/1455016

Change-Id: I76d7fab04e6f90e8e75d14c6e9b51d332266b0d9
2020-10-09 04:25:47 +00:00
Joe Onorato
f09dce28d3 Merge "Refactor OWNERS files in platform/build/make." 2020-10-09 03:59:38 +00:00
Dan Shi
f6e0927f4a Merge "Add missing target-native-copy-pairs util" am: a98b188e50
Original change: https://android-review.googlesource.com/c/platform/build/+/1455016

Change-Id: Ifcb09326bc953075a64db661192c92deef5e97f6
2020-10-09 03:49:38 +00:00
Dan Shi
a98b188e50 Merge "Add missing target-native-copy-pairs util" 2020-10-09 03:31:30 +00:00
Treehugger Robot
ef05c280df Merge "Allow zip64 support when opening zip files" am: 5b7e8e0406 am: 395bf6a5e9 am: 0f1054d98b am: 2046d2da00
Original change: https://android-review.googlesource.com/c/platform/build/+/1434831

Change-Id: I601c837cc74001186140f6fe3fbaa7e9ee08f180
2020-10-09 00:57:04 +00:00
Treehugger Robot
2046d2da00 Merge "Allow zip64 support when opening zip files" am: 5b7e8e0406 am: 395bf6a5e9 am: 0f1054d98b
Original change: https://android-review.googlesource.com/c/platform/build/+/1434831

Change-Id: Ie594dd6673e0e14f7bab6cf5f9c4a246be7d20c0
2020-10-09 00:44:01 +00:00
Treehugger Robot
0f1054d98b Merge "Allow zip64 support when opening zip files" am: 5b7e8e0406 am: 395bf6a5e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1434831

Change-Id: I5952b35b42e7409367dbaad88b1832066676161c
2020-10-09 00:29:53 +00:00
Treehugger Robot
395bf6a5e9 Merge "Allow zip64 support when opening zip files" am: 5b7e8e0406
Original change: https://android-review.googlesource.com/c/platform/build/+/1434831

Change-Id: Id7934964cb15d91e26a3b098ea198b4e4872630a
2020-10-09 00:07:30 +00:00
Treehugger Robot
5b7e8e0406 Merge "Allow zip64 support when opening zip files" 2020-10-08 23:35:56 +00:00
Yifan Hong
2c1430e614 Merge "Revert "Add timestamp to ramdisk."" am: fa1349600e am: c22d741274 am: 56c3ef1ca3 am: b88f9f6725
Original change: https://android-review.googlesource.com/c/platform/build/+/1455675

Change-Id: I1f0440af27a9dd9b0cd323ef85576fe66778d25b
2020-10-08 23:25:28 +00:00
Joe Onorato
ba048cb758 Refactor OWNERS files in platform/build/make.
Pulls out all of the per-file rules into their relevant directories
and includes platform/build/soong:/OWNERS as the authoritative
list of approvers.

Test: treehugger
Bug: 170407947
Change-Id: Icb885fc25a638f2f5134f6223df656ef4438bb67
2020-10-08 16:14:44 -07:00