Commit graph

60830 commits

Author SHA1 Message Date
J. Avila
8177ae20f3 Strip debug symbols from modules
The size of the ramdisk has greatly increased, which can be a source of
boot time regressions. Strip the modules of debug symbols for the vendor
ramdisk and vendor partitions; vendor stripping can be skipped via BOARD
config.

Bug: 156395749
Signed-off-by: J. Avila <elavila@google.com>
Change-Id: I7d1736da1599e265793173a741053d8a09f1622f
2020-05-29 09:30:13 -07:00
Hongguang Chen
bd8bcb4d98 [automerger skipped] Fix _ImportParser() error if property is imported from oem partition. am: 96c88287a7 -s ours
am skip reason: Change-Id I47875bf7a698390e11690150e6516a3064550ca0 with SHA-1 b4702b7006 is in history

Change-Id: I6b4f9ca8522a45c155f8d59e82a2c7996769a110
2020-05-29 00:30:26 +00:00
David Zeuthen
ea366764bb Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev am: c599a2708f
Change-Id: I0a4443d9bbcf8ad81c5cd8e4a075e2a1e57b8651
2020-05-28 23:36:09 +00:00
Hongguang Chen
96c88287a7 Fix _ImportParser() error if property is imported from oem partition.
The oem partition allows system build.prop to import properties from it
by "import /oem/oem.prop xxxx". An _ImportParser() error was raised on
this case.

BUG: 154171021
Test: 1) "atest --host releasetools_test releasetools_py3_test -c"
      2) On a device who has oem partition, "make dist" and sign its
      target zip file.
Change-Id: I47875bf7a698390e11690150e6516a3064550ca0
Merged-In: I47875bf7a698390e11690150e6516a3064550ca0
2020-05-28 15:22:31 -07:00
David Zeuthen
c599a2708f Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev 2020-05-28 22:04:19 +00:00
Tianjie Xu
415dc426a1 [automerger skipped] Merge changes I637dea34,I4a9fa35c,I5c952cd2 into rvc-dev am: 8098b73e0c -s ours
am skip reason: Change-Id I637dea3472354236d2fd1ef0a3306712b3283c29 with SHA-1 d6867167d1 is in history

Change-Id: I1e571b74e74a75bcf081c1ff20e4cabef176c719
2020-05-28 19:06:31 +00:00
Tianjie Xu
8098b73e0c Merge changes I637dea34,I4a9fa35c,I5c952cd2 into rvc-dev
* changes:
  Add an option to input the boot variables for OTA package generation
  Reland "Calculate the runtime fingerprint prefixes from build prop"
  Reland "Add a wrapper class PartitionBuildProp""
2020-05-28 18:56:21 +00:00
Yo Chiang
baca76e5f8 Merge "Check module existence with ALL_MODULES subvars" am: 0dcb96c204 am: 06d3445271
Change-Id: I8d10724a2afba3bc33a58957b63a48f75a72d683
2020-05-28 10:49:20 +00:00
Yo Chiang
06d3445271 Merge "Check module existence with ALL_MODULES subvars" am: 0dcb96c204
Change-Id: Ic6009117a309bd532ddd50daff8815eab74c6548
2020-05-28 10:30:45 +00:00
Yo Chiang
0dcb96c204 Merge "Check module existence with ALL_MODULES subvars" 2020-05-28 10:12:52 +00:00
Treehugger Robot
b9408ab697 Merge "Fix up recovery_text_res" am: 9e424a5a60 am: 08095b3301
Change-Id: I509f05b54014e1636f38c116e74c9514ec09581e
2020-05-28 08:44:00 +00:00
Treehugger Robot
08095b3301 Merge "Fix up recovery_text_res" am: 9e424a5a60
Change-Id: Id24ae6b16a83c93aa317fde0fed8215df99e202c
2020-05-28 08:33:46 +00:00
Treehugger Robot
9e424a5a60 Merge "Fix up recovery_text_res" 2020-05-28 08:23:00 +00:00
TreeHugger Robot
702dd3b342 [automerger skipped] Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" into rvc-dev am: 20daf73fd9 -s ours
am skip reason: Change-Id I0f4f837412075520153d21c9ca12cf5c3f555de7 with SHA-1 9425870f73 is in history

Change-Id: If2ef43fb2329f6996de2457f87c8e71686000efb
2020-05-28 06:27:19 +00:00
TreeHugger Robot
20daf73fd9 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" into rvc-dev 2020-05-28 06:12:35 +00:00
TreeHugger Robot
03ba879155 Merge "Add extra VNDK v30 to GSI" into rvc-dev-plus-aosp 2020-05-28 02:39:31 +00:00
Dan Willemsen
9767223dc5 Fix up recovery_text_res
First, make it safer for incremental builds. We used to just be
depending on the bootable/recovery/tools/recovery_l10n/res dir as a
dependency, but that would only trigger a rebuild if a direct child
file/directory was added or removed (so essentially, when a translation
was addded or removed). If a translation was updated, it wouldn't
re-trigger recovery_text_res.

So instead of depending on the directory, depend on the results from
running `find` to list all of the contents in that directory.

Next, move it out of PACKAGING. `m installclean`, which runs in between
incremental builds on our build servers, deletes the obj/PACKAGING
directory. So when recovery_text_res used that directory, we were having
to rebuild it on every incremental build, which isn't optimal when it
takes nearly 90s to build.

So with:
 $ lunch aosp_coral-eng
 $ m bootimage
 $ m installclean
 $ m bootimage

The second `m bootimage` went from executing 666 actions in 93s to
executing 658 actions in 6s.

Finally, remove the last uses of $(call include-path-for,recovery),
since they were all in this file (and they weren't using it for include
paths...). We'd like to remove all of these and switch them to header
libraries or other use cases, but in this case, it's just shorter to use
the real path.

Test: treehugger
Test: m bootimage;
      touch bootable/recovery/tools/recovery_l10n/res/values/strings.xml
      m bootimage
Test: m bootimage; m installclean; m bootimage

Change-Id: I005592e49443aab45ed039a2f0c63f7a69035565
2020-05-27 19:37:03 -07:00
Luke Huang
428d5d0406 Merge "Revert "DO NOT MERGE: Delete com.android.cronet from base_system. am: 8640960329"" into rvc-dev-plus-aosp 2020-05-28 02:34:40 +00:00
Chen Xu
15458b9d49 Merge "support data migration by default" into rvc-dev am: 18029ed3d2
Change-Id: Ib4525526ef6390d319a8294aaab0328551e1f1ff
2020-05-28 01:06:38 +00:00
Chen Xu
18029ed3d2 Merge "support data migration by default" into rvc-dev 2020-05-28 00:24:29 +00:00
Tianjie
48d159fa7c Add an option to input the boot variables for OTA package generation
The values of the ro.boot* variables are not part of the image files
and are provided (e.g. by bootloaders) at runtime. Meanwhile, their
values may affect some of the device build properties, as a different
build.prop file can be imported by init during runtime.

This cl adds an option to accepts a list of possible values for some
boot variables. The OTA generation script later use these values to
calculate the alternative runtime fingerprints of the device; and
list the device names and fingerprints in the OTA package's metadata.

The OTA metadata is verified by the OTA server or recovery to ensure
the correct OTA package is used for update. We haven't made any
restrictions on what ro.boot* variables can be used for fingerprint
override. One possible candidate can be the skus listed in
ODM_MANIFEST_SKUS.

Bug: 152167826
Test: unittests pass, generate an OTA file with the new option
Change-Id: I637dea3472354236d2fd1ef0a3306712b3283c29
Merged-In: I637dea3472354236d2fd1ef0a3306712b3283c29
2020-05-27 22:14:30 +00:00
Tianjie Xu
835aac5cf6 Reland "Calculate the runtime fingerprint prefixes from build prop"
This reverts commit b21e48b499.

In practice, some partners use the 'import' statement to override
the device fingerprint at runtime. The runtime fingerprint will
later add to the metadata of OTA package, so that the OTA server
can deliver the package to corresponding devices correctly.

This CL supports parsing a subset of import statement that the init
process recognizes. And we loose the restriction based on how the
dynamic fingerprint is used in practice. Right now, we only searches
for the override of brand, name and device. And the placeholder
format should be ${placeholder}, with its value supplied by the
script caller.

As part of the implementation, we generate all the possible
combinations of the input boot variables. And recalculate the
fingerprint for each of the combination. Though we load the
build.prop multiple times, the logic is easier to follow. Also,
it's more convenient to enhance the logic if we only want to
allow some of the boot variables combination later.

Bug: 152167826
Change-Id: I4a9fa35c7ac037ff1cf4f9a4bdff602beac3894b
Merged-In: I4a9fa35c7ac037ff1cf4f9a4bdff602beac3894b
Test: unittests pass
2020-05-27 22:14:02 +00:00
Tianjie Xu
726d20a68f Reland "Add a wrapper class PartitionBuildProp""
This reverts commit 6022545272.

The build prop for a partition used to be a simple key:value
dictionary. But we need more fields to hold the alternative build
props overriden by the 'import' statement. Therefore, add a new
class as a wrapper for these props first.

Bug: 152167826
Change-Id: I5c952cd2a976ba1a09ddc66d56c2b8b55a61986b
Merged-In: I5c952cd2a976ba1a09ddc66d56c2b8b55a61986b
Test: unittests pass
2020-05-27 22:13:34 +00:00
Treehugger Robot
b48890b4c3 [automerger skipped] Merge "Strip debug symbols from modules" am: a29edba6e8 am: 62067081f1 -s ours
am skip reason: Change-Id I248d4e2097992f00975b344b5da41aa5d8016812 with SHA-1 43872f0eb7 is in history

Change-Id: I627cef554473efad5dede49c348a2f9ef1b7bd8c
2020-05-27 21:17:47 +00:00
Treehugger Robot
62067081f1 Merge "Strip debug symbols from modules" am: a29edba6e8
Change-Id: Id69bfb9745152ac34572483538f794157feb46d4
2020-05-27 21:02:37 +00:00
Treehugger Robot
a29edba6e8 Merge "Strip debug symbols from modules" 2020-05-27 20:46:16 +00:00
Mark Salyzyn
4db64dc192 [automerger skipped] depmod: pair in a modules.load.recovery on BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD am: d702af1ef1 -s ours
am skip reason: Change-Id Ib2925aec6ea7a2a01a554c808d6697d8c85f9fc0 with SHA-1 4e20965769 is in history

Change-Id: Ia90fd62661f9fbbf1acdef7cccbd0774f7ad224f
2020-05-27 18:05:33 +00:00
Chen Xu
9dfa9ec4ae support data migration by default
include stub cellbroadcat app for data preservation by dafault.

Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
Merged-in: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
2020-05-27 16:15:48 +00:00
Beverly Tai
99da2d2bc6 Merge "Revert "Retire mainline.mk"" am: 7943056adc am: 39b8113e2c
Change-Id: I7787ab7f82da9e317ada146861e43a531104a59f
2020-05-27 14:27:46 +00:00
Beverly Tai
39b8113e2c Merge "Revert "Retire mainline.mk"" am: 7943056adc
Change-Id: I98b24f4046d297cfb3de230adaf3931487756d71
2020-05-27 14:16:30 +00:00
Beverly Tai
7943056adc Merge "Revert "Retire mainline.mk"" 2020-05-27 14:02:57 +00:00
Beverly Tai
4003bd9def Revert "Retire mainline.mk"
This reverts commit 60c0064902.

Reason for revert: build breakages

Change-Id: Ie8304d1979c50578901efed77fb31281c336505c
Fixes: 157548597
2020-05-27 13:28:22 +00:00
Mark Salyzyn
d702af1ef1 depmod: pair in a modules.load.recovery on BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD
If the BoardConfig defined BOARD_VENDOR_RAMDISK_MODULES_LOAD and
BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD, generate both a
modules.load and modules.load.recovery respectively on the vendor
ramdisk.  BOARD_VENDOR_RAMDISK_MODULES must be the set, or super set,
of all the modules represented in both of *_LOAD BOARD variables.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 151950334
Test: build, confirm, fastboot flashall, boot with split.
Merged-In: Ib2925aec6ea7a2a01a554c808d6697d8c85f9fc0
Change-Id: Ib2925aec6ea7a2a01a554c808d6697d8c85f9fc0
2020-05-27 13:26:00 +00:00
Treehugger Robot
617b6b0e06 Merge "Create emulator_* devices for emulators" am: 6a00738ed8 am: d5ec97ea5b
Change-Id: I93692595bbed7cea81b1bda8567eb551f844e2c8
2020-05-27 11:55:31 +00:00
Treehugger Robot
d5ec97ea5b Merge "Create emulator_* devices for emulators" am: 6a00738ed8
Change-Id: I36e5d7a963290c55bcb11e6ba94624ccf0d8649d
2020-05-27 11:42:07 +00:00
Treehugger Robot
6a00738ed8 Merge "Create emulator_* devices for emulators" 2020-05-27 11:27:58 +00:00
Treehugger Robot
3904663650 Merge "Retire mainline.mk" am: 8ecc4d5710 am: bafaa5b25e
Change-Id: I89d17d49b8dfb000fa24caaa45c7a928230bb9c4
2020-05-27 10:58:15 +00:00
Treehugger Robot
bafaa5b25e Merge "Retire mainline.mk" am: 8ecc4d5710
Change-Id: Ia7169a2a22e5e98a8742f2586e6e1997334d79da
2020-05-27 10:46:17 +00:00
Treehugger Robot
8ecc4d5710 Merge "Retire mainline.mk" 2020-05-27 10:31:28 +00:00
SzuWei Lin
68945a07a7 Add extra VNDK v30 to GSI
Bug: 154768946
Bug: 154672908
Test: build aosp_arm64-userdebug
Test: check system/system_ext/apex/com.android.vndk.v30
Change-Id: I2b32e28b973da0a3aeab0b10a542c64e3fec3273
2020-05-27 08:50:57 +00:00
SzuWei Lin
c73db784b9 Create emulator_* devices for emulators
aosp_arm64 has no emulators after the patch:

https://android-review.googlesource.com/c/platform/build/+/1286895

The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.

Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
2020-05-27 16:41:44 +08:00
TreeHugger Robot
60714701b4 [automerger skipped] Merge "Generate product build props always" into rvc-dev am: 0e5c584ba8 -s ours
am skip reason: Change-Id Ia88c8efecb18db9c27baa466e492bfd898b581d3 with SHA-1 1e6b3e78df is in history

Change-Id: I92391877330262e0e839dfe3873ef5d98238a252
2020-05-27 04:59:02 +00:00
TreeHugger Robot
0e5c584ba8 Merge "Generate product build props always" into rvc-dev 2020-05-27 04:46:06 +00:00
Howard Chen
64b6535f43 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8 am: 67a7b6d830
Change-Id: I3c37fbd4de8aa2e00918430fca0e154cb83330d5
2020-05-27 03:00:47 +00:00
Treehugger Robot
d8046ecc67 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" am: aa0584c22d am: acb4079c27
Change-Id: Ifed6b9fda6781576d06f896176787c2b362be182
2020-05-27 03:00:40 +00:00
Yo Chiang
694ae5bab1 [automerger skipped] Merge "Remove mainline_arm64.mk" am: e32703d3be am: 3b75a5943a -s ours
am skip reason: Change-Id I08990b70d45c0663a9700f41b670513674bf7e97 with SHA-1 68bee4b679 is in history

Change-Id: I8bc6d8064209b1564a1b934ee050add1164b7642
2020-05-27 03:00:32 +00:00
Howard Chen
67a7b6d830 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8
Change-Id: I5545cec112a88122fe09b834cd386ca47363600e
2020-05-27 02:44:18 +00:00
Howard Chen
c0ea7e89b8 Merge "Add tinyhostless to mainline_system.mk" 2020-05-27 02:41:37 +00:00
Treehugger Robot
acb4079c27 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" am: aa0584c22d
Change-Id: I3bb8a8b2f0997f289e532e61b320690a3bf42157
2020-05-27 02:38:14 +00:00
Yo Chiang
3b75a5943a Merge "Remove mainline_arm64.mk" am: e32703d3be
Change-Id: I015632ecf33407e47d1b6f13ca8c0c510124aeb8
2020-05-27 02:38:03 +00:00