Commit Graph

64154 Commits

Author SHA1 Message Date
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
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 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
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 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 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
Xin Li 5d15b8dd5e Skip ab/6749736 in stage.
Bug: 167233921
Merged-In: I19ebbf405d4565c35a9201369facf6bb4c249335
Change-Id: Ia5d57c864a2550b59d189e461213cf8f3ecc014c
2020-10-08 22:59:59 -07:00
Steve Muckle 1d83969db8 Merge "use new GKI kernel location" 2020-10-09 05:34:46 +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
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
Yifan Hong 33fd5d4277 Add <ramdisk>/system/etc/ramdisk/build.prop.
Add a build.prop file for ramdisk. Properties uses the
name ro.[product.]bootimage*.

These ro.[product.]bootimage.* properties are also included in recovery
properties.

The file is installed to system/etc/ramdisk/build.prop under ramdisk.

On devices with dedicated recovery partition, the file is
installed to ramdisk/, which is installed to the ramdisk in the boot
image. The file is NOT installed to recovery/root to prevent
collision.

On devices with recovery_as_boot, in addition to ramdisk/, it is also
installed to recovery/root, which is installed to the ramdisk in the
boot image.

Test: m bootimage and inspect output
Bug: 169169031
Bug: 162623577
Bug: 170411692
Bug: 170364317

Change-Id: Ica6515b2a4e0f4a7fe4440434a3d7085fde64387
2020-10-09 00:48:37 +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
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
Yifan Hong c22d741274 Merge "Revert "Add timestamp to ramdisk."" am: fa1349600e
Original change: https://android-review.googlesource.com/c/platform/build/+/1455675

Change-Id: I80376505533606fb95484de71b15a0aefcd42526
2020-10-08 22:36:33 +00:00
Daniel Norman 42879ff536 Various fixes to PRODUCT_BUILD_<IMAGE> variables.
- Introduces PRODUCT_BUILD_VENDOR_BOOT_IMAGE.
  - Controls vendor_boot.img, replacing TARGET_NO_VENDOR_BOOT.
  - Matches the naming convention of other similar vars.
- Guards boot-debug.img behind BUILDING_BOOT_IMAGE
- Restructures BUILDING_BOOT_IMAGE to give priority to
  PRODUCT_BUILD_BOOT_IMAGE, as do other partitions.
- ^ for BUILDING_RECOVERY_IMAGE.

Test: PRODUCT_BUILD_{BOOT,RECOVERY,VENDOR_BOOT}_IMAGE := false
      m dist
      Observe no boot, boot-debug, recovery, or vendor_boot images.
Bug: 169968221
Bug: 170423509
Change-Id: I629bf08ba08e5db14c1bf92bb338fb3ce59d5b73
2020-10-08 22:31:52 +00:00
Yifan Hong fa1349600e Merge "Revert "Add timestamp to ramdisk."" 2020-10-08 22:28:43 +00:00
Yifan Hong 0bbbc93c31 Revert "Add timestamp to ramdisk."
This reverts commit 7a532ab1e9.

Reason for revert: conflicts with device-specific sepolicy

Bug: 170364317
Bug: 170411692
Change-Id: I9e7094e5f7be6f2c53ed27c658530370d794a5e2
2020-10-08 22:14:44 +00:00
Steve Muckle 4f10706721 use new GKI kernel location
The GKI kernel is now stored in kernel/prebuilts.

Bug: 161563956
Change-Id: Ie74ca26e8e9bf05c824eb87e03eeda865d861dde
2020-10-08 20:25:49 +00:00
Anton Hansson 351a317cd5 Remove apidiff task and droiddoc jdiff support
Nothing uses these anymore.

Bug: 158465496
Test: m
Change-Id: Iaef4f7ca7e5d21b1850d7491247f13782c9bb23a
2020-10-08 19:06:21 +01:00
Dan Shi ab42cd0eb9 Add missing target-native-copy-pairs util
The function was in test/framework/build/utils/vtslab_package_utils.mk
It was removed as part of the cleanup of vts10.
Function target-native-copy-pairs is still used to package kernel native
tests.

Bug: 170339160
Test: m vts
Change-Id: I0097022f05fc9adc47a664c63a8341040b4af106
2020-10-08 10:13:40 -07:00
Yifan Hong 5c1b199b87 Build otatools files before building OTA packages.
Test: m otapackage, then check $ANDROID_HOST_OUT

Bug: 169169031
Change-Id: I0d943d6c5b4054783094c8eb38c6660e9c49e201
2020-10-08 09:51:36 -07:00
Treehugger Robot bdf813163f Merge "Add timestamp to ramdisk." am: 396b0a2074
Original change: https://android-review.googlesource.com/c/platform/build/+/1438074

Change-Id: I96939238300de3e08fa1717362325b5189171112
2020-10-08 04:15:13 +00:00
Treehugger Robot 396b0a2074 Merge "Add timestamp to ramdisk." 2020-10-08 03:50:37 +00:00
Treehugger Robot 2899375ad9 Merge "Skip unneeded notice files for DATA modules." am: 3592aedd78
Original change: https://android-review.googlesource.com/c/platform/build/+/1453719

Change-Id: Ic09de6f7ab9ddfc1326724430fef7893cc04b804
2020-10-08 02:36:07 +00:00
Treehugger Robot 3592aedd78 Merge "Skip unneeded notice files for DATA modules." 2020-10-08 02:17:18 +00:00
Treehugger Robot 7917ae1355 Merge "Include selinux_policy_* for product and system_ext." am: 09da8b1ba1
Original change: https://android-review.googlesource.com/c/platform/build/+/1452335

Change-Id: I8f1d74140367aa482aea788631406d73ddb83d2c
2020-10-08 00:59:57 +00:00
Treehugger Robot 09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot d9bf9e3e2c Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba5554a
Original change: https://android-review.googlesource.com/c/platform/build/+/1425158

Change-Id: Ibc43aa606d9ffeaa2a558ee02031abdfed0ebdb6
2020-10-07 21:14:33 +00:00
Jesse Hall a16690c38c Skip unneeded notice files for DATA modules.
Non-installable generated intermediate data modules can have
notice files attached when they're defined in the same LOCAL_PATH
as the installable module that depends on them. This makes uninstallable
DATA modules silently ignore the fact that the build doesn't know where
to install the notice file.

Bug: 160248517
Test: build
Change-Id: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
Merged-In: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
2020-10-07 14:01:12 -07:00
Treehugger Robot c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Martin Stjernholm bf4e8f4708 Make the build fail when the executable prebuilt target check fails.
Amends https://r.android.com/1439191; I realised echo-error doesn't
imply a false status.

Test: m art-check-{release,debug,testing}-apex-gen-fakebin
  without https://r.android.com/1441933.
Bug: 169375644
Change-Id: Ice75aeab30120e781df50a28c3dce3874ec0bfd1
2020-10-07 21:04:51 +01:00
Justin Yun 599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Felix Elsner d7df770c4a soong_config: Support SYSTEM_EXT* sepolicy vars
The new variable name reflects its actual usage.

Keep compatibility with BOARD_PLAT_* because it has been a
convention for years. Also add warning messages for BOARD_PLAT_*
variables via KATI_deprecated_var.

Test: `make selinux_policy` with
      `SYSTEM_EXT_{PUBLIC,PRIVATE_SEPOLICY_DIRS}` set,
      observe additions in `$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/selinux`

Signed-off-by: Felix Elsner <google@ix5.org>
Change-Id: I58c64839cc513ae082cd3ee3c1e108843ea7439e
2020-10-07 15:56:52 +08:00
Felix Elsner 501ca68fd5 soong_config: Plat->SystemExt*SepolicyDirs
Align with changes in build/soong and system/sepolicy.

Test: build

Signed-off-by: Felix Elsner <google@ix5.org>
Change-Id: I73b773a4fb0bd626a989251d5c61381fcafaa1eb
2020-10-07 15:56:03 +08:00
Yifan Hong 7a532ab1e9 Add timestamp to ramdisk.
Add a build.prop file for ramdisk. Properties uses the
name ro.[product.]bootimage*.

These ro.[product.]bootimage.* properties are also included in recovery
properties.

The file is installed to boot/etc/build.prop under ramdisk.

On devices with dedicated recovery partition, the file is
installed to ramdisk/, which is installed to the ramdisk in the boot
image. The file is NOT installed to recovery/root to prevent
collision.

On devices with recovery_as_boot, in addition to ramdisk/, it is also
installed to recovery/root, which is installed to the ramdisk in the
boot image.

Test: m bootimage and inspect output
Bug: 169169031
Bug: 162623577

Change-Id: I94b993ce3214356036d038b6db57c4e1b755c111
2020-10-06 16:10:38 -07:00
Xin Li ea79600e99 Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 2f171ac0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1449163

Change-Id: I3a0710c04d92f7e2f12865a112ecf22e7a728c7b
2020-10-06 20:24:16 +00:00
The Android Open Source Project 78fc6e3738 DO NOT MERGE - Merge RP1A.201005.006 am: a4c45b8d52
Original change: https://android-review.googlesource.com/c/platform/build/+/1449163

Change-Id: I55f41e896efa0ebd2ab610a9497a7d5111f52e7d
2020-10-06 20:23:55 +00:00
Xin Li 2f171ac0a5 Merge "DO NOT MERGE - Merge RP1A.201005.006" 2020-10-06 20:17:27 +00:00
The Android Open Source Project a4c45b8d52 DO NOT MERGE - Merge RP1A.201005.006
Bug: 168212094
Merged-In: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
Change-Id: Ic9c7b4d7339ab624418c1fbc95e66674cffdef71
2020-10-06 16:48:22 +00:00
Treehugger Robot e57ea5ed1b Merge "Remove build tasks for vts10" am: 70b4738324
Original change: https://android-review.googlesource.com/c/platform/build/+/1449155

Change-Id: I787541a9dd4a51a81381830da0727b7d3ad6cbe2
2020-10-06 03:59:09 +00:00
Jooyung Han 674721e97f Merge "Use file_contexts for flattened apexes" am: a00c0f1f23
Original change: https://android-review.googlesource.com/c/platform/build/+/1435451

Change-Id: I2f92d53210523cc2d81c9e28392b0758a3eb7ea8
2020-10-06 03:43:54 +00:00