Commit Graph

20222 Commits

Author SHA1 Message Date
Chris Gross b56351ac7b Merge "Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags" am: 84c96eba1e
am: e9425427c2

Change-Id: I367fdc842308a47b6a68dd416788bffa61f11764
2019-05-08 11:35:40 -07:00
Chris Gross e9425427c2 Merge "Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags"
am: 84c96eba1e

Change-Id: I66f4b0e3faaf3fcc16cd51a1e1f93d549fd708fd
2019-05-08 11:30:33 -07:00
Chris Gross 84c96eba1e Merge "Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags" 2019-05-08 18:21:42 +00:00
Jiyong Park b233b2bb09 Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set
am: 18411a42f0

Change-Id: I55c69b9e1686f97daa6348e6829995f368882e71
2019-05-08 08:35:05 -07:00
Jiyong Park 18411a42f0 Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set
TARGET_FLATTEN_APEX and ro.apex.updatable cannot be independently set.
For a device where updating APEXes is not supported, ro.apex.updatable
should not be set (or set to false) and TARGET_FLATTEN_APEX should be
set to true. For APEX-supporting devices, it is the opposite;
ro.apex.updatable == true and TARGET_FLATTEN_APEX is false (or not set).

To ensure this relationship, TARGET_FLATTEN_APEX is by default set to
true, and overridden to false when updatable_apex.mk is inherited.

Bug: 130623080
Test: choosecombo to Pixels 2 and later; get_build_var
TARGET_FLATTEN_APEX returns false.
choosecombo to the original Pixel and other non-Pixel targets;
get_build_var TARGET_FLATTEN_APEX returns true.
choosecombo to the cuttlefish; get_build_var TARGET_FLATTEN_APEX
returns false

Change-Id: Id73a594dd9838457e68e2793122592c11a84fc83
2019-05-08 20:51:21 +09:00
Tao Bao 5a35c87281 Merge "Compute the needed shared libs for otatools." am: 5eba1c9a67
am: 5fd2a085c3

Change-Id: I1b82b6858c0b3e2578a1709f7e5ab65adf620735
2019-05-07 21:34:25 -07:00
Tao Bao 5fd2a085c3 Merge "Compute the needed shared libs for otatools."
am: 5eba1c9a67

Change-Id: I7a96636c6d61f0bed1d248c70eb7f58fb09a8ae6
2019-05-07 21:14:09 -07:00
Treehugger Robot 5eba1c9a67 Merge "Compute the needed shared libs for otatools." 2019-05-08 03:44:33 +00:00
Tao Bao 655eb08b7b Merge "Use the installed vboot_signer." am: 40c03ff116
am: f7d0b06ee9

Change-Id: I486195329cac8335fa64c37be38933493e045e68
2019-05-07 18:53:04 -07:00
Tao Bao f7d0b06ee9 Merge "Use the installed vboot_signer."
am: 40c03ff116

Change-Id: I6369c9779b84c8d0cd9f5baafa9094426b946846
2019-05-07 17:51:20 -07:00
Tao Bao 40c03ff116 Merge "Use the installed vboot_signer." 2019-05-07 23:40:57 +00:00
Colin Cross 7d352e2e37 Merge "Use --ignore_missing_files when creating symbols.zip" am: 96ba044c94
am: 2022a3bea7

Change-Id: I8658224759864c9acfd94574117f6c2c972cd305
2019-05-07 15:34:14 -07:00
Colin Cross 2022a3bea7 Merge "Use --ignore_missing_files when creating symbols.zip"
am: 96ba044c94

Change-Id: I6374ab49d0307dfe55ca940880987f596bbb353c
2019-05-07 14:56:24 -07:00
Colin Cross 8d34244739 Use --ignore_missing_files when creating symbols.zip
symbols.zip is created while files that are not part of the platform
build but were requested on the Make command line (for example by
passing "tests") are still being installed.  Installation often
involves removing and then recreating the file.  If the file
exists when the list of files to be zipped is created, but is
removed when soong_zip is zipping, it fails with an error.  Pass
--ignore_missing_files to silence the error and keep zipping.

Fixes: 79503862
Test: m checkbuild
Change-Id: I1fbbf1f1396948288ee133c319b2e19dee97983b
2019-05-07 11:47:13 -07:00
Chris Gross a784ef197c Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags
Bug: 123428770
Test: Built system-only image and checked that no boot.img or
recovery.img files where created. Booted the resulting merged build on
device.

Change-Id: I760476502775e68125907c39e66b8665e789a798
2019-05-07 11:00:37 -07:00
Anton Hansson caebe98e39 Merge "Mark many single value variables as such" am: c43a3e1103
am: 4550977e75

Change-Id: I14dfb1471a7914ceeea0a81cb7b399e1203b311c
2019-05-07 02:38:52 -07:00
Anton Hansson fc51b3379d Merge "Add support for single-value product variables" am: 3e29407793
am: 4d60168865

Change-Id: I742b3f366091d5eff94a909be28d8ecf115843c5
2019-05-07 02:38:02 -07:00
Anton Hansson 4550977e75 Merge "Mark many single value variables as such"
am: c43a3e1103

Change-Id: Ieae944df8cb9be17ab6af35bc43959ed532fac1e
2019-05-07 02:33:30 -07:00
Anton Hansson 4d60168865 Merge "Add support for single-value product variables"
am: 3e29407793

Change-Id: I190269b39392c5daf70e84d50b68432b80a66ef5
2019-05-07 02:32:48 -07:00
Bowgo Tsai 30a4eb54fc Using a test key to sign boot-debug.img if needed
When /boot partition is chained in AVB signing, libavb will try to
read AVB footer from the end of /boot partition, even if the device is
unlocked. However, this makes device unbootable when the unsigned
boot-debug.img is flashed on /boot partition. This CL uses a test key
from external/avb to sign the boot-debug.img if /boot partition is
chained.

Bug: 126493225
Bug: 129508966
Test: Enables chain partition for boot.img, `make bootimage_debug` then
      checks `avbtool info_image --image $OUT/boot-debug.img`
Test: `make bootimage_debug-nodeps`
Test: boot a device with a chained boot-debug.img

Change-Id: I870cb70c70b7d4d7a30b77bed58cbca6e007d5e3
Merged-In: I870cb70c70b7d4d7a30b77bed58cbca6e007d5e3
(cherry picked from commit 26b0a26e3e)
2019-05-07 17:27:43 +08:00
Anton Hansson c43a3e1103 Merge "Mark many single value variables as such" 2019-05-07 09:18:53 +00:00
Anton Hansson 3e29407793 Merge "Add support for single-value product variables" 2019-05-07 09:14:27 +00:00
Tao Bao 96daeebd0e Compute the needed shared libs for otatools.
This keeps the packed shared libs in sync with their executables.

This CL also changes the packing location of mke2fs.conf, from
system/extras/ext4_utils/mke2fs.conf to bin/mke2fs.conf.

Bug: 34738751
Test: `m -j otatools-package`. Compare the packed files against the ones
      prior to this CL.
Change-Id: Icae88e3cd898460f5ba7dc11ab8a57350630c432
2019-05-06 20:03:57 -07:00
Tao Bao d14c2f88df Use the installed vboot_signer.
Bug: 34738751
Test: Set `PRODUCT_SUPPORTS_VBOOT := true` and `m -j otatools-package`.
      Check the packed tools.
Test: Set `PRODUCT_SUPPORTS_VBOOT := true` and `m -j bootimage`.
Change-Id: Ia2ea475e3dc03cada1da524a299a21b8ad7ed536
2019-05-06 20:03:24 -07:00
Bowgo Tsai dd0739a150 Merge "Using a test key to sign boot-debug.img if needed" am: 38809bdf99
am: f446127bfd

Change-Id: Ic674845eb69d1d73c7acc5c2014467ab88df7a08
2019-05-06 19:08:49 -07:00
Bowgo Tsai f446127bfd Merge "Using a test key to sign boot-debug.img if needed"
am: 38809bdf99

Change-Id: Id87fa9dff8cb390a12fc41bb37bdba126a1ae2d1
2019-05-06 18:40:34 -07:00
Treehugger Robot 38809bdf99 Merge "Using a test key to sign boot-debug.img if needed" 2019-05-07 01:07:02 +00:00
Tao Bao ff18d4a79a Merge "Remove unused shared libs from otatools." am: 59c700154b
am: 844d65efe8

Change-Id: I3ae40279986e54cb87fbd889e60b9a4876eb4b50
2019-05-06 09:47:52 -07:00
Tao Bao 844d65efe8 Merge "Remove unused shared libs from otatools."
am: 59c700154b

Change-Id: I0c2be0c51cd10cc375d3fc60d20ba957f0439af4
2019-05-06 09:42:40 -07:00
Tao Bao 59c700154b Merge "Remove unused shared libs from otatools." 2019-05-06 16:32:25 +00:00
Bo Hu 489a1e56bc Merge "emulator: support dynamic partitions"
am: 73c9f03b66

Change-Id: Ibc7a7576746eaa9eed5f2fed3539ee726d2bb630
2019-05-06 08:34:52 -07:00
Anton Hansson c1c4c0bbf0 Mark many single value variables as such
This changes these variables to not inherit multiple values,
which allow for some more flexibility in how/where they're defined
in makefiles.

Also remove the previous equivalent solution that was in place for
the PRODUCT_BUILD_* flags.

Bug: 116769560
Test: presubmit
Change-Id: Ia27a11d95263ceb45ffa355e75bb2aa6d9672139
2019-05-06 16:19:19 +01:00
Anton Hansson d26c647f74 Add support for single-value product variables
Prior to this change, all PRODUCT_* variables are inherited with
list semantics, meaning the variable value in the current makefile
as well as all the makefiles it inherits are concatenated together.

Many of these variables are not lists, so this change adds the
ability to classify a variable as a single-value variable, which
will inherit at most one value (the first one), unless the variable
is already defined in the current file.

This change also marks all current variables as list variables.
A future change will re-classify the single-value variables as such.

Bug: 116769560
Test: presubmit
Change-Id: I57719a5eefd0749e92c08b1773b6f929629267a3
2019-05-06 16:17:20 +01:00
Tao Bao 1d642bc382 Remove unused shared libs from otatools.
libcurl-host.so was added for delta_generator (commit f8e6fbe2f5).
libext2_misc.so and libext2_profile-host.so were added for e2fsck and
build_verity_tree (commit d0ec665727). None of them is actively used by
otatools.

Bug: 34738751
Test: `m -j otatools-package`. Unzip and check that there's no missing
      shared libs reported by ldd.
Change-Id: Id229e450f5f2eaa03a6c6cf568a1912add06754c
2019-05-05 20:42:25 -07:00
bohu 9492ee3d1b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
Merged-In: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-05 20:34:02 -07:00
Colin Cross 19f72cd6ec Merge "Support PRESIGNED in soong_app_prebuilt.mk" am: d4079c5019
am: 72abaabbf4

Change-Id: I9ba711b901dc497aaa6230ee8f3c8a39519432a9
2019-05-03 18:50:28 -07:00
Colin Cross 72abaabbf4 Merge "Support PRESIGNED in soong_app_prebuilt.mk"
am: d4079c5019

Change-Id: I683c3513959c63139bc1412b21adef70a1c15d60
2019-05-03 18:23:54 -07:00
Bowgo Tsai 26b0a26e3e Using a test key to sign boot-debug.img if needed
When /boot partition is chained in AVB signing, libavb will try to
read AVB footer from the end of /boot partition, even if the device is
unlocked. However, this makes device unbootable when the unsigned
boot-debug.img is flashed on /boot partition. This CL uses a test key
from external/avb to sign the boot-debug.img if /boot partition is
chained.

Bug: 126493225
Bug: 129508966
Test: Enables chain partition for boot.img, `make bootimage_debug` then
      checks `avbtool info_image --image $OUT/boot-debug.img`
Test: `make bootimage_debug-nodeps`
Test: boot a device with a chained boot-debug.img

Change-Id: I870cb70c70b7d4d7a30b77bed58cbca6e007d5e3
2019-05-04 09:01:09 +08:00
Treehugger Robot d4079c5019 Merge "Support PRESIGNED in soong_app_prebuilt.mk" 2019-05-04 00:22:29 +00:00
dimitry cee5b0bc9f Merge "Enable native_bridge" am: 37eadacc20
am: ededd543a2

Change-Id: I0ec76ef7e0261c1ba8a3beebb3460d0916620714
2019-05-03 16:47:29 -07:00
dimitry ededd543a2 Merge "Enable native_bridge"
am: 37eadacc20

Change-Id: I5a72caab8eca7c800e3e0167a1da82eeeba2d8b7
2019-05-03 16:08:17 -07:00
Colin Cross d2a6f86dbb Merge "Remove reverse-list from java static libraries." am: 7c485728cf
am: e16405d5ec

Change-Id: If05c7b7d1e1c81ef94c9772c170229a8b3ba4712
2019-05-03 15:24:51 -07:00
Treehugger Robot 37eadacc20 Merge "Enable native_bridge" 2019-05-03 22:23:00 +00:00
Colin Cross e16405d5ec Merge "Remove reverse-list from java static libraries."
am: 7c485728cf

Change-Id: I50621dc253cf479f8c7befcc4fe933562c8e4f0e
2019-05-03 14:35:28 -07:00
Colin Cross 7c485728cf Merge "Remove reverse-list from java static libraries." 2019-05-03 21:31:47 +00:00
Martin Stjernholm f853c6c747 Merge "Add the library absence check as a kati stage check." am: 6c0a3af4bf
am: 175f8da975

Change-Id: I4fc27834a2f4285b18248c11755bae05a015226e
2019-05-03 08:24:46 -07:00
Martin Stjernholm 175f8da975 Merge "Add the library absence check as a kati stage check."
am: 6c0a3af4bf

Change-Id: I638e5838930d100d9771d3690c29bb9e0b4d4a93
2019-05-03 08:19:31 -07:00
Treehugger Robot 6c0a3af4bf Merge "Add the library absence check as a kati stage check." 2019-05-03 15:09:18 +00:00
Tao Bao 721a294a1c Merge "Update the references to verity tools." am: 31c2bf905e
am: ee153db46a

Change-Id: I9f6b38c0538b8b0e9146c622dfb807f170398c8d
2019-05-03 06:59:30 -07:00
Tao Bao ee153db46a Merge "Update the references to verity tools."
am: 31c2bf905e

Change-Id: I83f5ec259273007f7ba61e486a0150e8ef9b69e8
2019-05-03 06:51:19 -07:00