Commit graph

45535 commits

Author SHA1 Message Date
Treehugger Robot
5c83c19538 Merge "Move manifest merger config to Soong" 2018-07-11 20:18:59 +00:00
Tao Bao
ff4434f433 Merge "releasetools: Remove RemoveBackwardEdges()."
am: d4b9e01f39

Change-Id: If887e4f4e453f1ec2b199ac249d844e753129803
2018-07-11 12:13:04 -07:00
Dan Willemsen
518373f8af Add more status output
soong_ui now parses the output from kati into "actions" to feed into the
unified status system. It also looks for errors and marks the enclosing
section as failed.

This adds a few more states so that error messages can be more
appropriately attributed - so that all errors at the end of the buid
aren't attributed to the last makefile read.

Test: m
Test: add some errors
Change-Id: I3abdb004c82e2b99822906910cd66123c11a5099
2018-07-11 12:00:56 -07:00
Tao Bao
d4b9e01f39 Merge "releasetools: Remove RemoveBackwardEdges()." 2018-07-11 19:00:32 +00:00
TreeHugger Robot
17c0bfa66a Merge "Move manifest merger config to Soong" into stage-aosp-master 2018-07-11 17:39:12 +00:00
Tao Bao
b047778ebd Merge "releasetools: Address two issues with system_root_image file map."
am: 81421ccf38

Change-Id: I171a9a7b8a4b0e1051e8752f519ca5d81e3b0f4f
2018-07-11 10:14:56 -07:00
Tao Bao
81421ccf38 Merge "releasetools: Address two issues with system_root_image file map." 2018-07-11 17:01:50 +00:00
Colin Cross
5bcb2fc9a9 Move manifest merger config to Soong
Bug: 110848854
Test: m checkbuild
Change-Id: Id9a8b4c02ade275eefc32bf72710430e889cd554
Merged-In: Id9a8b4c02ade275eefc32bf72710430e889cd554
Merged-In: Ib20aa4849978283f1da1ce601b28199fc0183e05
2018-07-11 09:43:04 -07:00
Anton Hansson
3ca5df4c40 [automerger skipped] Merge "Split generic_no_telephony in two."
am: f1429b1c31  -s ours

Change-Id: Ibd7b64a9813ee45cfe001f307be821260c76cddc
2018-07-11 02:59:23 -07:00
Anton Hansson
f1429b1c31 Merge "Split generic_no_telephony in two." 2018-07-11 09:55:06 +00:00
Anton Hansson
2211b0b162 Merge "Split generic_no_telephony in two." into stage-aosp-master 2018-07-11 08:05:25 +00:00
Colin Cross
4871e77f0a Move manifest merger config to Soong
Bug: 110848854
Test: m checkbuild
Change-Id: Id9a8b4c02ade275eefc32bf72710430e889cd554
2018-07-10 22:49:15 -07:00
Tao Bao
5bab0dd1c4 releasetools: Remove RemoveBackwardEdges().
RemoveBackwardEdges() was used only in BBOTA v1 (which has been
deprecated since O). v2+ calls ReverseBackwardEdges() and
ImproveVertexSequence().

Also remove the imgdiff tag of 'trimmed' that would be set through this
function() only.

Test: python -m unittest test_blockimgdiff
Test: Build an incremental non-A/B OTA.
Test: Code search shows no active user.
Change-Id: I3b58ae048a1fbc283269e70fdfa29eb8d184ede7
2018-07-10 22:13:40 -07:00
Tao Bao
d3554e628f releasetools: Address two issues with system_root_image file map.
With system_root_image, e2fsdroid writes file map with extra leading
slashes in filenames (e.g. "//system/framework/am.jar"). This breaks the
detection of files with incomplete ranges, and thus fails the patch
generation. This CL addresses the issue by stripping out leading
slashes.

Additionally, non-/system files (e.g "//sbin/charger") are not packed
under SYSTEM/ in a target_files.zip, despite being part of system.img.
We need to look for these files under ROOT/ instead.

This CL also asserts the availability of all files listed on a file map,
to avoid silently missing other edge cases.

Bug: 80380658
Test: python -m unittest test_common
Test: Successfully generated an incremental for a target using
      system_root_image that was previously failing.
Change-Id: I62a2460e882f3930e99add4d2b44291edf7a51a0
2018-07-10 16:05:14 -07:00
Mathieu Chartier
80acf67e50 [automerger skipped] Merge "Move ro.config.low_ram back to being a vendor property"
am: ccd16f7948  -s ours

Change-Id: Ia92caa53635eb5232b53484483434edbe4c6c8c8
2018-07-10 15:27:12 -07:00
Mathieu Chartier
ccd16f7948 Merge "Move ro.config.low_ram back to being a vendor property" 2018-07-10 22:09:14 +00:00
Anton Hansson
f58e3a9109 [automerger skipped] Merge "Split core_minimal in two."
am: 8b6a9ffad3  -s ours

Change-Id: I7ae2a1162fda29f07a555ea1f8602430b0cf8f51
2018-07-10 14:16:11 -07:00
Anton Hansson
8b6a9ffad3 Merge "Split core_minimal in two." 2018-07-10 21:10:08 +00:00
Anton Hansson
f2525e2699 Merge "Split core_minimal in two." into stage-aosp-master 2018-07-10 20:44:25 +00:00
Mathieu Chartier
2fb62c8ea0 Move ro.config.low_ram back to being a vendor property
Bug: 110517986
Test: make
Change-Id: I1394ac1220c290533fbe9641d10c5997362577fd
2018-07-10 13:19:14 -07:00
Tao Bao
a81bd16fa4 Merge "Group the generic props together in generate-image-prop-dictionary."
am: 8f48f18f69

Change-Id: I6d3efecbb1c7c2f7722673d71dbcbae0d40e6483
2018-07-10 13:12:57 -07:00
Tao Bao
8f48f18f69 Merge "Group the generic props together in generate-image-prop-dictionary." 2018-07-10 20:02:40 +00:00
Tao Bao
3602eca6d6 Group the generic props together in generate-image-prop-dictionary.
Test: m dist
Change-Id: Iedb62c246e9ae8c88ff7822122d6c182aa925738
2018-07-10 10:54:11 -07:00
Colin Cross
357bed2f65 Merge "Make USE_D8 and USE_R8 read-only"
am: 670dd68705

Change-Id: I04e82b076c3669fa3a3ce73e2012c9c430ce47eb
2018-07-10 09:51:05 -07:00
Anton Hansson
c3d7b36b86 Split generic_no_telephony in two.
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.

Also update mainline_system to inherit handheld_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
2018-07-10 17:50:35 +01:00
Anton Hansson
cac1fc8b76 Split generic_no_telephony in two.
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.

Also update mainline_system to inherit handheld_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
2018-07-10 17:47:15 +01:00
Treehugger Robot
670dd68705 Merge "Make USE_D8 and USE_R8 read-only" 2018-07-10 16:38:44 +00:00
Dario Freni
8a599e54a2 Merge "Generate a NOTICE xml file for /product partition."
am: bd64cd3fe8

Change-Id: I3a8ab1d4bc4f034c7646d31182bbe01814797b8d
2018-07-10 09:27:36 -07:00
Dario Freni
bd64cd3fe8 Merge "Generate a NOTICE xml file for /product partition." 2018-07-10 16:16:14 +00:00
Anton Hansson
34bca8808e Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Merged-In: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:49:05 +01:00
Anton Hansson
c16e2b2878 Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:45:03 +01:00
Dario Freni
adc972d7bb Generate a NOTICE xml file for /product partition.
Bug: 111179267
Test: tested on a device with /product partition enabled.
Change-Id: I333f916da214c71e04ebd3fe3bf4dac1e341b098
2018-07-10 11:54:56 +01:00
Anton Hansson
bfc78def01 Merge "Warn when defining a 32-bit product on a 64-bit device."
am: 4788f5b094

Change-Id: I705ee5fb954c156e7e57dda684ce5d45b23ffb97
2018-07-09 23:39:11 -07:00
Anton Hansson
28b699fbbe [automerger skipped] Merge "Align base_system and core_minimal with internal."
am: a37da42c12  -s ours

Change-Id: I70c1f38e1e8786f898b290b33d237125d67ebd58
2018-07-09 23:38:40 -07:00
Anton Hansson
0b14a57aaf Merge "Make including missing modules an error."
am: 65dc646c76

Change-Id: I7cf277de314e06d84cc19c0def52cd035bbae51a
2018-07-09 23:37:57 -07:00
Anton Hansson
0c6795938a [automerger skipped] Merge "Move packages from base_system to base_vendor."
am: b02bda26bd  -s ours

Change-Id: I895669af593e860e6d0a331433d442a7ad6242ae
2018-07-09 23:37:24 -07:00
Anton Hansson
378f4bcb52 [automerger skipped] Merge "Remove redundant packages from core_minimal.mk"
am: 56a3498703  -s ours

Change-Id: Id322db2482753e3234c141a5b890947286789bc6
2018-07-09 23:36:51 -07:00
Anton Hansson
4788f5b094 Merge "Warn when defining a 32-bit product on a 64-bit device." 2018-07-10 06:29:44 +00:00
Anton Hansson
a37da42c12 Merge "Align base_system and core_minimal with internal." 2018-07-10 06:29:13 +00:00
Anton Hansson
65dc646c76 Merge "Make including missing modules an error." 2018-07-10 06:28:41 +00:00
Anton Hansson
b02bda26bd Merge "Move packages from base_system to base_vendor." 2018-07-10 06:27:30 +00:00
Anton Hansson
56a3498703 Merge "Remove redundant packages from core_minimal.mk" 2018-07-10 06:27:08 +00:00
Anton Hansson
60389468a7 Merge "Move packages from base_system to base_vendor." into stage-aosp-master 2018-07-10 05:59:38 +00:00
Anton Hansson
0546208495 Merge "Remove redundant packages from core_minimal.mk" into stage-aosp-master 2018-07-10 05:59:19 +00:00
Luis Hector Chavez
930ceb30b9 Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE"
am: b676d6d609

Change-Id: I0e13f4327ce066a56f856985c07f1e8f4c373d24
2018-07-09 16:13:08 -07:00
Treehugger Robot
b676d6d609 Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2018-07-09 23:04:32 +00:00
Mathieu Chartier
cab7408131 Merge "Add logic to preopt both archs for SDK libs"
am: f3c54cfa78

Change-Id: I1f0336118e71c7da5fa5526425121811c0faace6
2018-07-09 12:58:13 -07:00
Treehugger Robot
f3c54cfa78 Merge "Add logic to preopt both archs for SDK libs" 2018-07-09 19:49:51 +00:00
Luis Hector Chavez
ff48993ca6 Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE
When using BOARD_BUILD_SYSTEM_ROOT_IMAGE, there is no direct dependency
on the files that get typically added to the ramdisk.img apart from the
NOTICE.html dependency that some files have. This change explicitly adds
the ramdisk/root files as a dependencies of system.img so that the image
is recreated any time a file in the ramdisk changes. It also creates the
installed-files-root.txt file.

Bug: 62387674
Test: /init.rc is present in system.img's dependencies
Change-Id: I234cb8d8a648f8963610be519de1b70b7efe1fd7
2018-07-09 11:07:12 -07:00
Mathieu Chartier
502892a936 Add logic to preopt both archs for SDK libs
Update stale PRODUCT_SYSTEM_SERVER_JARS list since
com.android.location.provider was renamed to
com.android.location.provider.impl.

Added logic to preopt both archs for SDK libs that are also system
server JARS.

Bug: 110780021
Test: manual and verify speed compiled

(cherry picked from commit 4568c2d908)

Merged-In: I34e728444ffda6db3375b638028d54b6ab623209
Change-Id: If0cb68ba4808aa8716099c5447645f4baac63f30
2018-07-09 11:05:21 -07:00