Commit Graph

45418 Commits

Author SHA1 Message Date
Mathieu Chartier 7ae8bb5efa Merge "Revert "Revert "Default to nostripping for non /system preopt"""
am: 401fada3f5

Change-Id: I36025bea5e3c69e72d3dcdaa50649c73cfaf0d28
2018-07-17 11:28:04 -07:00
Mathieu Chartier 401fada3f5 Merge "Revert "Revert "Default to nostripping for non /system preopt""" 2018-07-17 18:13:20 +00:00
Isaac Chen 19a41487e9 Merge "Create extra symbolic links at root for arm64 GSI"
am: 226dd71836

Change-Id: I83fa295a8657ba93dd7e8e008e4c929499c0d1fd
2018-07-16 21:12:25 -07:00
Treehugger Robot 226dd71836 Merge "Create extra symbolic links at root for arm64 GSI" 2018-07-17 04:04:12 +00:00
Dan Willemsen f32fa7ca45 Merge "Remove '=' from the valid module/stem names"
am: 45819baa42

Change-Id: I6da2cdf86fd13c7d694913912b3c02da1e859ef0
2018-07-16 20:02:01 -07: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
Dan Willemsen bd75f03293 Merge "Remove showcommands from docs"
am: 25e4495de1

Change-Id: I6bc0933317901f9c3b060f98fd20f258d10006c8
2018-07-14 11:40:09 -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
Jiyong Park 129a6e9da2 Merge "fix typo"
am: 0e4c76743a

Change-Id: I3300c9ac28a00ce98c29f34bb654a3860e9e1b5f
2018-07-14 07:22:57 -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
Yifan Hong 8b55abd98f Merge "move device_manifest.xml to base_vendor.mk"
am: bc15d75e5c

Change-Id: I9d6a6164cc19f6d1059373907010ace556784a8c
2018-07-12 21:14:41 -07:00
Tao Bao 40e1bb6df9 Merge "releasetools: Fix secondary payload generation."
am: c26dea96a2

Change-Id: I64322df5111736b9276103fb71c36e9ec4a9e1d3
2018-07-12 21:13:29 -07:00
Dan Willemsen 468206e4cd Merge "Add more status output"
am: 5787711e75

Change-Id: I0f6ee9a8ac4c04ed8effd2a2962503462954c360
2018-07-12 21:06:51 -07:00
David Brazdil 4a4bd136bb [automerger skipped] Merge "Add singleton rule for hiddenapi list generation"
am: dc39f73d5b  -s ours

Change-Id: Icdd7c46206183f74640a7e7c3922a19acc52ea19
2018-07-12 21:06:02 -07:00
Treehugger Robot bc15d75e5c Merge "move device_manifest.xml to base_vendor.mk" 2018-07-13 02:56:01 +00:00
David Brazdil 467a10c261 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
Change-Id: I826d8ac513a41a1d6d5e29a8300073158cff5acf
Merged-In: I826d8ac513a41a1d6d5e29a8300073158cff5acf
(cherry picked from commit a39db48511)
2018-07-13 00:52:05 +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 45812e5dbe Fix inconsistency in base_vendor.mk
Test: none
Change-Id: Ia980c42b3bae42d25f993194f10e3b24d5bf102b
2018-07-12 18:29:18 +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
Yueming Wang 32ae3af7f5 Merge "Revert "Default to nostripping for non /system preopt""
am: 901d05469e

Change-Id: I56fa81942ef48580b503f47fd790ab4f5436b790
2018-07-12 09:42:17 -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 69a009fd11 Merge "Default to nostripping for non /system preopt"
am: f37c37bac8

Change-Id: I3b89ee79d25a4815b2668243b4bb8abbf8ae5e56
2018-07-11 17:05:37 -07: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
Colin Cross d37df9c290 [automerger skipped] Merge "Move manifest merger config to Soong"
am: 5c83c19538  -s ours

Change-Id: Ia559e6615b44713d048f45d1d77c2115aed3b637
2018-07-11 13:30:20 -07:00
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