Commit Graph

46679 Commits

Author SHA1 Message Date
Tom Cherry aafccd7aac Merge "Separate init packaging for mainline"
am: eea8dad05f

Change-Id: I9ddf2c1357793e28e81cf06d31abaa58acf798f6
2018-10-16 13:38:36 -07:00
Tom Cherry eea8dad05f Merge "Separate init packaging for mainline" 2018-10-16 20:29:47 +00:00
Tom Cherry 6195b3578a Separate init packaging for mainline
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system.  This change references two phony
packages that include the right parts of init for systen and vendor.

Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
2018-10-16 09:58:54 -07:00
Anton Hansson 22db4db050 Merge "Allow more relaxed artifact path req enforcement"
am: 0e91bac015

Change-Id: I66d996ba72a234623dea55c7ad0bf501d4b96037
2018-10-15 23:46:12 -07:00
Anton Hansson 0e91bac015 Merge "Allow more relaxed artifact path req enforcement" 2018-10-16 06:38:32 +00:00
Tao Bao 4fdbd7ddd8 Merge "releasetools: Clean up the logging while calling external commands."
am: 909c332fab

Change-Id: I3a6892dd5d9664963a315631bf2299d265066dc5
2018-10-15 21:34:18 -07:00
Treehugger Robot 909c332fab Merge "releasetools: Clean up the logging while calling external commands." 2018-10-16 03:45:47 +00:00
Haibo Huang 55bae8010b Merge "Add A76 to known v8-a cores"
am: 4e90c3f9a5

Change-Id: Ie1057b7b2794856621332e016a40634fa239504b
2018-10-15 14:15:42 -07:00
Haibo Huang 4e90c3f9a5 Merge "Add A76 to known v8-a cores" 2018-10-15 21:01:30 +00:00
Anton Hansson 9cdf17241a Allow more relaxed artifact path req enforcement
Only enforce whitelist entries are unused if the enforcement variable
is set to "true" or "strict". If set to something else (e.g. "relaxed"),
allow redundant whitelist entries.

This also enables adding wildcard entries, which were previously
considered unused.

Test: downstream
Bug: 117637311
Bug: 80410283
Change-Id: I67a84f8ecfad5fa68c21ee728f1e3085ef89fbcf
2018-10-15 20:49:48 +01:00
Tao Bao bec89c1e1e releasetools: Clean up the logging while calling external commands.
common.RunAndCheckOutput() checks the exit code and will raise on errors.

Test: python -m unittest test_ota_from_target_files
Test: Call ota_from_target_files.py with aosp_marlin target_files zip
Test: Inject an error to the command. Repeat the call without verbose
      flag. It dumps the stack trace on error.
Change-Id: I85b765a33b9087bcbcb0571d6e632a07bb86c65c
2018-10-15 12:01:42 -07:00
Anton Hansson f9ae891d1c Merge "Revert "Add trailing slash to mainline path claims.""
am: d1874ddf86

Change-Id: I4b945a7432a91b8294395da65542f8c155c361bf
2018-10-15 03:29:21 -07:00
Anton Hansson d1874ddf86 Merge "Revert "Add trailing slash to mainline path claims."" 2018-10-15 10:17:38 +00:00
Anton Hansson 46bf4b510c Revert "Add trailing slash to mainline path claims."
This reverts commit f1fb31a301.

Reason for revert: breaks some builds

Change-Id: I22f7939dc25bee6e3c2b8835f86ce5772ab3edec
2018-10-15 10:13:35 +00:00
Anton Hansson 249b60d0d8 Merge "Add trailing slash to mainline path claims."
am: 9d5b3dbf17

Change-Id: I936ddb71273ecab183219aa8614d3683aac66017
2018-10-15 01:48:17 -07:00
Anton Hansson 9d5b3dbf17 Merge "Add trailing slash to mainline path claims." 2018-10-15 08:34:02 +00:00
Tao Bao 39eb5ff367 Merge "releasetools: Fix a broken test due to verity utils relocation."
am: 1e5a23f9b0

Change-Id: I4643bc586713d80db0ad4efa552cbd4191ce7dff
2018-10-14 08:17:59 -07:00
Tao Bao 1e5a23f9b0 Merge "releasetools: Fix a broken test due to verity utils relocation." 2018-10-14 14:58:57 +00:00
Tao Bao 28f201b417 releasetools: Fix a broken test due to verity utils relocation.
Test: python -m unittest test_validate_target_files
Change-Id: I2267e18f63d4a36ecd5fff911848470a860ab6cf
2018-10-13 19:27:52 -07:00
Tao Bao ca6cdfe973 Merge "releasetools: Move verity related functions into verity_utils.py."
am: d685239e37

Change-Id: I149ebee9b429ddddbb3b98172760214daecf597b
2018-10-13 08:45:38 -07:00
Tao Bao d685239e37 Merge "releasetools: Move verity related functions into verity_utils.py." 2018-10-13 15:34:06 +00:00
Haibo Huang e211f7cd2d Add A76 to known v8-a cores
Bug: 117125298
Test: build
Change-Id: Ice05e7d4996252cfe4a9881a628c11b0f12cfd1b
2018-10-12 23:54:51 +00:00
Tao Bao f81b80f89f Merge "Check dir existence before finding files for OTATOOLS_DEPS."
am: fd96f57263

Change-Id: I1ec0ab995281ace1cdf222a9b70071b82b334dee
2018-10-12 15:14:56 -07:00
Treehugger Robot fd96f57263 Merge "Check dir existence before finding files for OTATOOLS_DEPS." 2018-10-12 21:56:37 +00:00
Tao Bao 71197515bb releasetools: Move verity related functions into verity_utils.py.
This prepares for upcoming changes that refactor verity-related
functions into classes.

This CL makes minimal changes to the moved functions, by creating a new
BuildVerityImageError class in verity_utils.py replacing the former
BuildImageError that's specific to build_image.py. As part of the
change, it also moves the tests for AVBCalcMinPartitionSize into
test_verity_utils.py.

Test: python -m unittest test_verity_utils
Test: `m dist` with aosp_marlin-userdebug (Verified Boot 1.0)
Test: `m dist` with aosp_taimen-userdebug (Verified Boot 2.0)
Change-Id: I19b52714d8980705ea1f9484ac03eb0af9483240
2018-10-12 12:09:34 -07:00
Tao Bao d2c34f3a07 Merge "releasetools: Add a common base class for unittests."
am: e95680a60f

Change-Id: Ib3d68cdf51b9640e1aabf33a8df987c01faa0df1
2018-10-12 11:52:27 -07:00
Tao Bao e95680a60f Merge "releasetools: Add a common base class for unittests." 2018-10-12 18:33:56 +00:00
Tao Bao 93ab84467f Check dir existence before finding files for OTATOOLS_DEPS.
This avoids building errors in branches that don't include such projects
(e.g. external/avb or system/update_engine). Note that although it
won't actually build otatools in such branches, it fails while parsing
the Makefile.

Bug: 112293933
Test: Rename external/avb. `m otatools` passes.
Change-Id: I334239fb23b1795ec77049ba9b81b288d2b4e2da
2018-10-12 11:28:17 -07:00
Kostya Kortchinsky 31c22382f0 Merge "Scudo minimal runtime support for make"
am: d772deb653

Change-Id: I962901f30e815238dd0cc805cc61d8fbc602fe00
2018-10-12 10:04:00 -07:00
Kostya Kortchinsky d772deb653 Merge "Scudo minimal runtime support for make" 2018-10-12 16:49:31 +00:00
Bowgo Tsai ad0114acb1 Merge "Allow GSI targets to build otatools.zip"
am: 07d87198ee

Change-Id: Ie2732eccba803709d7f34ccaf1fd287f90d2cc8a
2018-10-12 07:45:49 -07:00
Treehugger Robot 07d87198ee Merge "Allow GSI targets to build otatools.zip" 2018-10-12 14:35:43 +00:00
Anton Hansson f1fb31a301 Add trailing slash to mainline path claims.
Fixes a bug where system_other/ paths are considered part of
the "system" path.

Test: lunch mainline_arm64; m nothing
Change-Id: Id7aad41ea285f545260289f59e55c251677bdc38
2018-10-12 11:10:17 +01:00
Vladimir Marko 9f4847e753 Merge "Prebuild: Remove --multi-image."
am: f696914fb5

Change-Id: If1b7edd3b7190856065445fad86164bdcd951b99
2018-10-12 02:22:11 -07:00
Vladimir Marko f696914fb5 Merge "Prebuild: Remove --multi-image." 2018-10-12 09:00:56 +00:00
Bowgo Tsai d6ff89705c Allow GSI targets to build otatools.zip
otatools.zip is required to sign GSI.

Bug: 112293933
Test: lunch aosp_arm64-userdebug && make otatools-package
Test: lunch aosp_arm64-userdebug && make otapackage will fail
Change-Id: Iae9f9af5cc8b98c05a66219779ce35592d3321bd
2018-10-12 14:41:46 +08:00
Tao Bao 3cfdcd4918 Merge "releasetools: Rename test names in test_verity_utils.py."
am: f77560ec12

Change-Id: I1d7299b94799f6c5bd78c64b8aa19328d9f3ac81
2018-10-11 23:06:44 -07:00
Tao Bao 65b94e92be releasetools: Add a common base class for unittests.
All the releasetools unittests extend the common base class of
test_utils.ReleaseToolsTestCase. Define tearDown() in the base class to
do the clean-up works.

Test: `pylint --rcfile=pylintrc test_*.py`
Test: `python -m unittest discover .`
Change-Id: I51775d964ef032dcdf3bb89c55e1a31371cde708
2018-10-11 23:01:09 -07:00
Treehugger Robot f77560ec12 Merge "releasetools: Rename test names in test_verity_utils.py." 2018-10-12 05:58:24 +00:00
Sooraj Sasindran 837eeb1f8e Merge "Add ANS to telephony systems"
am: 0c833a7fba

Change-Id: I960d762d49dc04d26d013511fba5747a0fd5761d
2018-10-11 21:55:17 -07:00
Treehugger Robot 0c833a7fba Merge "Add ANS to telephony systems" 2018-10-12 04:41:09 +00:00
Kostya Kortchinsky 47c10eb2fc Scudo minimal runtime support for make
Scudo is now compatible with the -fsanitize-minimal-runtime, and offers a new
dynamic library that doesn't bundle UBSan.

This patch adds support for this new library in make, preferring it over the
full one, unless a diagnostic dependency is found.

Test: aosp compiled with m -j
Test: local test enabling Scudo for mediaextractor
Change-Id: I99ac0d410b1619de09783f5009476c1ea2995f98
2018-10-11 15:06:11 -07:00
Steven Moreland 3aefd6a480 Merge "VNDK-core += android.hidl.safe_union@1.0.so"
am: bb0d85169f

Change-Id: I42f0cea6881173c68be44c50f0bc2c5ae5bb64ba
2018-10-11 14:44:12 -07:00
Tao Bao 5fe287beb4 releasetools: Rename test names in test_verity_utils.py.
There's a naming convention between the testcase and the class/method
being tested.

Also remove VerifiedBootVersion2HashtreeInfoGenerator as it's merely a
placeholder without telling anything much (e.g. whether it's to be
implemented or working as intended).

Test: python -m unittest test_verity_utils
Change-Id: Ieb156765c865aa551e3882f381e3a6db2cac4cbc
2018-10-11 14:39:09 -07:00
Steven Moreland bb0d85169f Merge "VNDK-core += android.hidl.safe_union@1.0.so" 2018-10-11 21:23:27 +00:00
Tao Bao 6c22649500 Merge "releasetools: Move build_image.RunCommand into common.py."
am: b2dd1b6365

Change-Id: I52f67f635c16b1212e5023044bbdca45f2b7a0ff
2018-10-11 14:14:49 -07:00
Tao Bao b2dd1b6365 Merge "releasetools: Move build_image.RunCommand into common.py." 2018-10-11 20:53:41 +00:00
Tom Cherry 4ac9c871b0 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline"
am: 37660e2e32

Change-Id: I4b6bace334b13f8b20a94f37e0154c1b6b14d858
2018-10-11 11:14:22 -07:00
Tom Cherry 37660e2e32 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline" 2018-10-11 17:57:20 +00:00
Pirama Arumuga Nainar dfec4ef4fc Merge "Change STL for Windows to libc++."
am: 5155d9a8dd

Change-Id: Ia64df0c4d320424c31a0b63e72c9a365eb0a27b3
2018-10-11 10:21:28 -07:00