Commit graph

62961 commits

Author SHA1 Message Date
Yifan Hong
63c5ca19ab Add BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE.
BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE removes kernel from the
recovery image.

Test: build recovery image and unpack_bootimg
Test: build target files and unpack_bootimg IMAGES/recovery.img
      on device with GKI and dedicated recovery partition.

Bug: 156098440

Change-Id: I5f37d74ed954b26fe3dd778708b6ab9cfdc51f1e
2020-10-15 14:58:34 -07:00
Yifan Hong
d381f7336a Add GKI global variable.
Add BOARD_USES_GENERIC_KERNEL_IMAGE to be the global variable to
indicate the device uses GKI image.

Test: pass

Bug: 156098440

Change-Id: Ica553bbdb791e25dfa9bafb524ab2de5e3f8720d
2020-10-15 14:58:34 -07:00
Yifan Hong
c75a3c5434 Merge "Add <ramdisk>/system/etc/ramdisk/build.prop." 2020-10-12 18:37:43 +00:00
Martin Stjernholm
dee171a859 Merge "Make the build fail when the executable prebuilt target check fails." 2020-10-12 09:24:38 +00:00
Treehugger Robot
6d34f734ae Merge changes from topic "board-system-ext-sepolicy"
* changes:
  soong_config: Support SYSTEM_EXT* sepolicy vars
  soong_config: Plat->SystemExt*SepolicyDirs
2020-10-12 03:49:24 +00:00
Steve Muckle
a5e1dc4b1c Merge "Revert^2 "use new GKI kernel location"" 2020-10-12 00:42:56 +00:00
Yifan Hong
49ccbb3729 Merge "Build otatools files before building OTA packages." 2020-10-09 18:06:43 +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
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
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
1d83969db8 Merge "use new GKI kernel location" 2020-10-09 05:34:46 +00:00
Joe Onorato
f09dce28d3 Merge "Refactor OWNERS files in platform/build/make." 2020-10-09 03:59: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
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
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
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
396b0a2074 Merge "Add timestamp to ramdisk." 2020-10-08 03:50:37 +00:00
Treehugger Robot
3592aedd78 Merge "Skip unneeded notice files for DATA modules." 2020-10-08 02:17:18 +00:00
Treehugger Robot
09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +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
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
70b4738324 Merge "Remove build tasks for vts10" 2020-10-06 03:30:31 +00:00
Jooyung Han
a00c0f1f23 Merge "Use file_contexts for flattened apexes" 2020-10-06 03:26:14 +00:00
Treehugger Robot
b1fbb747b8 Merge "tasks: find-sharedui-violation: Partition location" 2020-10-06 02:14:47 +00:00
Dan Shi
82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Yifan Hong
871e3c6032 Merge "Fix boot-* to kernel-* dependency" 2020-10-02 18:43:12 +00:00
Po-Chien Hsueh
2a5719c809 Merge "Filter out host paths on platform-availability-check errors" 2020-10-02 03:53:01 +00:00
Colin Cross
3ed9b8b7f9 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" 2020-10-02 01:06:10 +00:00
Mathieu Chartier
62ae5b55fe Merge "Do not set ro.iorapd.enable=true" 2020-09-30 21:54:59 +00:00
Yifan Hong
3e0b5d0355 Fix boot-* to kernel-* dependency
For example, if BOARD_KERNEL_BINARIES contains kernel-5.4, make sure
boot-5.4.img depends on kernel-5.4.

Test: remove kernel-5.4 from out directory then build boot image
Fixes: 169725104
Change-Id: I85624f3595c1a698bc27d19c73349138bb6e9e8c
2020-09-30 11:54:04 -07:00
Po-Chien Hsueh
e3b44f551c Filter out host paths on platform-availability-check errors
If a module, which is installed to both the host and the platform,
fails the platform-availability-check, the build system might use
the host install path to report errors. Filter out the host install
path so that the platform install path is used.

Bug: 169393514
Test: make
Change-Id: Ib39715ffc45cc32e3bd7ce5f2a3725d243f3237f
2020-09-30 08:18:03 +00:00
Treehugger Robot
fd4a406174 Merge "Fix conflict with common zsh alias" 2020-09-29 22:52:17 +00:00
Ben Taitelbaum
8c2c9cfa9d Fix conflict with common zsh alias
oh-my-zsh common-aliases plugin defines `alias -g T='| tail'`, which causes an
error with the line `local T dir f`.

Making these lines more explicit resolves this issue, while also being clearer
that the intent is to clear out the local variables.

Bug: 169191000
Fix: 169191000
Test: source build/envsetup.sh; lunch <target>; m
Change-Id: Ief27aa3d9f541d0c39c6c11d7d771818d6493d31
2020-09-29 20:50:57 +00:00
Janis Danisevskis
3cc7647af1 Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt
Change-Id: Icd9644e468a29d5ca47291faaaa9f5ca3fc4902c
2020-09-29 07:09:45 -07:00