Commit Graph

42120 Commits

Author SHA1 Message Date
Treehugger Robot 805ab25e05 Merge "releasetools: Remove the assertion of not allowing thumbprint in Treble world." 2018-07-19 21:57:06 +00:00
Tao Bao 4223012099 releasetools: Remove the assertion of not allowing thumbprint in Treble world.
The claim in the original CL doesn't seem to hold. We may still have
devices using both of thumbprint and Treble compatibility check.

Bug: 111640956
Test; python -m unittest test_ota_from_target_files
Test: Build an incremental package for a target using thumbprints.
Change-Id: Ia491d5279901c2385d1c30802abcb99d65d919cc
2018-07-19 10:16:45 -07:00
Mathieu Chartier 401fada3f5 Merge "Revert "Revert "Default to nostripping for non /system preopt""" 2018-07-17 18:13:20 +00:00
Treehugger Robot 226dd71836 Merge "Create extra symbolic links at root for arm64 GSI" 2018-07-17 04:04:12 +00:00
Treehugger Robot 45819baa42 Merge "Remove '=' from the valid module/stem names" 2018-07-17 02:51:29 +00:00
Mathieu Chartier fd5dfb817c Revert "Revert "Default to nostripping for non /system preopt""
Added logic to not preopt tests. Re-enabled usage of
my_module_multilib since this is referenced in setup_one_odex.

Bug: 110156979
Test: make
Test: forrest first boot tests

This reverts commit 9234def313.

Change-Id: I6a6ea2cd0024c33c0cfbd60f3a1f4ad5b1609dc8
2018-07-16 19:36:24 -07:00
Isaac Chen 50978e8640 Create extra symbolic links at root for arm64 GSI
Relevant firmware/SW components have been moved out of directories
under root, but not all references to them updated. For example,
/vendor/firmware_mnt won't be used by Android to load firmware.
So we still need these symlinks so the firmware/SW components can
be accesses.

These links should be removed after all references are updated.

Bug: 111287060
Test: $ lunch aosp_arm64-userdebug; m -j
      # Checked $OUT/root for the added links
Change-Id: Ia7915dbdeabdee7a5cf8851772e89f080b927c45
2018-07-17 10:10:31 +08:00
Dan Willemsen f012af1aab Remove '=' from the valid module/stem names
Kati produces errors when a variable containing '=' is used as a
dependency:

https://github.com/google/kati/issues/138

So provide a better error message instead.

Test: Add a module with an '=', see new error
Change-Id: I09d570a8d19abb067621af9983a9d568b643dfb0
2018-07-16 13:57:52 -07:00
Treehugger Robot 25e4495de1 Merge "Remove showcommands from docs" 2018-07-14 18:32:44 +00:00
Dan Willemsen 0ae41f2e79 Remove showcommands from docs
Test: none
Change-Id: Ia0be98049710175a0f3276841ef0c0bd2ccb60b6
2018-07-14 09:32:13 -07:00
Treehugger Robot 0e4c76743a Merge "fix typo" 2018-07-14 14:16:46 +00:00
Jiyong Park be4910a0de fix typo
PRIATE -> PRIVATE

Test: m -j
Change-Id: I33bbdcefee8acb16e9d8fcdb4c86ce294b3c1762
2018-07-14 15:06:48 +09:00
Treehugger Robot bc15d75e5c Merge "move device_manifest.xml to base_vendor.mk" 2018-07-13 02:56:01 +00:00
Tao Bao c26dea96a2 Merge "releasetools: Fix secondary payload generation." 2018-07-13 00:03:37 +00:00
Treehugger Robot 5787711e75 Merge "Add more status output" 2018-07-12 23:14:44 +00:00
Tao Bao 1248980a8b releasetools: Fix secondary payload generation.
The change in [1] removed duplicating radio images from RADIO/ to
IMAGES/. When getting the target_files zip for generating secondary
payload, we need to additionally copy the files under RADIO/ over.

[1] commit 5277d1015f

Test: python -m unittest test_ota_from_target_files
Test: Generate an OTA with secondary payload (--include_secondary).
Change-Id: I096f1642a905fb764e63f5df2edc1396aa6befd8
2018-07-12 14:52:52 -07:00
David Brazdil dc39f73d5b Merge "Add singleton rule for hiddenapi list generation" 2018-07-12 21:34:54 +00:00
Yifan Hong 17d4bcb83a move device_manifest.xml to base_vendor.mk
Test: make
Change-Id: I500269591065569f3102d025b222517dfd4e2c84
2018-07-12 11:23:52 -07:00
Treehugger Robot 901d05469e Merge "Revert "Default to nostripping for non /system preopt"" 2018-07-12 16:32:46 +00:00
Yueming Wang 9234def313 Revert "Default to nostripping for non /system preopt"
This reverts commit 25f9aa8c4b.

Reason for revert: This CL is likely to break several targets in pi-dev-plus-aosp and oc-mr1-dev-plus-aosp.

Change-Id: I3b29cbdf54007d2043ea1d2e4fe8d56d45eced9e
2018-07-12 14:38:59 +00:00
David Brazdil ab501e0d8b Add singleton rule for hiddenapi list generation
The lists of public/private APIs used for non-SDK API restriction
enforcement used to be generated by Doclava. In Q we're switching
to resolving android.jar (and other SDK stub JARs) against the boot
class path directly to avoid lowering Doclava's high-level view of
the framework and issues related to it.

This patch adds a new build rule which invokes `hiddenapi` on all
boot class path dex files simultaneously. The tool generates two
text files - one with public and one with private APIs.

Bug: 79409988
Test: m out/target/common/obj/PACKAGING/hiddenapi-private-list.txt
Merged-In: I826d8ac513a41a1d6d5e29a8300073158cff5acf
Change-Id: I826d8ac513a41a1d6d5e29a8300073158cff5acf
(cherry picked from commit a39db48511)
2018-07-12 08:58:14 +00:00
Mathieu Chartier f37c37bac8 Merge "Default to nostripping for non /system preopt" 2018-07-11 23:43:58 +00:00
Mathieu Chartier 25f9aa8c4b Default to nostripping for non /system preopt
Enables preopting of product partition apps.

Disabled secondary arch preopt for TARGET_TRANSLATE_2ND_ARCH to fix
preopt errors for some tests.

Test: test-art-host
Bug: 110156979
Change-Id: I0370a309913c8a516e01563aef451e7ab5819129
2018-07-11 14:29:16 -07:00
Treehugger Robot 5c83c19538 Merge "Move manifest merger config to Soong" 2018-07-11 20:18:59 +00: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
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 f1429b1c31 Merge "Split generic_no_telephony in two." 2018-07-11 09:55:06 +00: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 ccd16f7948 Merge "Move ro.config.low_ram back to being a vendor property" 2018-07-10 22:09:14 +00:00
Anton Hansson 8b6a9ffad3 Merge "Split core_minimal in two." 2018-07-10 21:10:08 +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 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
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
Treehugger Robot 670dd68705 Merge "Make USE_D8 and USE_R8 read-only" 2018-07-10 16:38:44 +00: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
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 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
Treehugger Robot b676d6d609 Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2018-07-09 23:04:32 +00: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