Commit Graph

43606 Commits

Author SHA1 Message Date
Dan Willemsen 043098087d Merge "Remove obsolete BRILLO variable" am: a0c1cc97bd
am: 55a5475ec2

Change-Id: I3cb12da7a6c9a86e9d7d1d9f77481b5cc2030d73
2018-03-12 22:04:05 +00:00
Dan Willemsen 55a5475ec2 Merge "Remove obsolete BRILLO variable"
am: a0c1cc97bd

Change-Id: Ifa9ec91b5d3c425c1f9ed8773ccf92f8183e3449
2018-03-12 21:54:02 +00:00
Dan Willemsen a0c1cc97bd Merge "Remove obsolete BRILLO variable" 2018-03-12 21:26:03 +00:00
Mathieu Chartier 94b0a48c8b Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev
am: 1a50e975ae

Change-Id: I73e643ebd7e9ad4d7a1fa8c2528cb0c692c9a97b
2018-03-12 19:23:16 +00:00
Mathieu Chartier 1a50e975ae Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev 2018-03-12 18:47:10 +00:00
Tao Bao 69cc0de37b Merge "releasetools: Support validating Verified Boot images." am: 1a6220f598
am: b5376ee331

Change-Id: I3db23dc63900c3e3bc92f1b02033dfa4ffeceefe
2018-03-12 17:49:01 +00:00
Tao Bao b5376ee331 Merge "releasetools: Support validating Verified Boot images."
am: 1a6220f598

Change-Id: I01df81acf75285162288fa4df398979ca39d506e
2018-03-12 17:43:16 +00:00
Treehugger Robot 1a6220f598 Merge "releasetools: Support validating Verified Boot images." 2018-03-12 17:29:49 +00:00
Roland Levillain 1b9cb4cf8d Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" into pi-dev
am: 8344d024f3

Change-Id: I5ade55b20e85cc0ea6f5286a4a91bd6148c37813
2018-03-12 12:56:06 +00:00
Roland Levillain 8344d024f3 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" into pi-dev 2018-03-12 12:41:53 +00:00
Tao Bao ba557707d8 releasetools: Support validating Verified Boot images.
For a given (signed) target-files.zip, this CLs allows verifying the
Verified Boot related images. It works with both of VB 1.0 and VB 2.0
images.

As part of the CL, it also moves validate_target_files.py to argparse,
which is more flexible than the traditional getopt module.

Also add unittests for the VB 1.0 path. VB 2.0 tests will be added in
follow-up CL.

Example usage:

- Run the script on aosp_bullhead target-files.zip.

$ ./build/make/tools/releasetools/validate_target_files.py \
    --verity_key build/target/product/security/verity.x509.pem \
    --verity_key_mincrypt build/target/product/security/verity_key \
    aosp_bullhead-target_files-4522605.zip

- Run the script on aosp_walleye target-files.zip.

$ ./build/make/tools/releasetools/validate_target_files.py \
    --verity_key external/avb/test/data/testkey_rsa4096.pem \
    aosp_walleye-target_files-4627254.zip

Bug: 63706333
Bug: 65486807
Test: Run validate_target_files.py on target_files.zip files.
Test: PYTHONPATH=build/make/tools/releasetools python -m unittest \
          test_validate_target_files
Change-Id: I170f14d5828d15f3687d8af0a89a816968069057
2018-03-12 00:17:09 -07:00
Dan Willemsen 19bd9b99ce Remove obsolete BRILLO variable
Test: none
Change-Id: Ia4474927709ccfa1ff76f5dda1d8aa13ef9d1004
2018-03-10 15:23:12 -08:00
Dan Willemsen 10cdd60b9f Merge "Fix xz with SANITIZE_HOST" am: b16a5b8d17
am: ad8b133476

Change-Id: Ibd3a9b4699e58fdb830a2ebed1db96b7e9802d85
2018-03-10 09:17:39 +00:00
Dan Willemsen ad8b133476 Merge "Fix xz with SANITIZE_HOST"
am: b16a5b8d17

Change-Id: Ia87634d0e4ca8aefba556dd627bb62def9f6daa6
2018-03-10 09:11:58 +00:00
Treehugger Robot b16a5b8d17 Merge "Fix xz with SANITIZE_HOST" 2018-03-10 09:03:39 +00:00
Dan Willemsen 6b3a8380cc Fix xz with SANITIZE_HOST
There isn't an Address Sanitizer prebuilt of xz, so always use the same
xz prebuilt.

Bug: 36130900
Test: SANITIZE_HOST=address m nothing; check ninja file
Test: m libc
Change-Id: Iba3599d4289ad5afb573dbec5ac8fc463668b1c6
2018-03-09 22:38:37 -08:00
Dan Willemsen bc84ac12c7 Merge "Use xz prebuilt" am: 8e287901c3
am: 0a0181bb96

Change-Id: Ie81e1f1ee105263bce6c2ac4b132b9828b9d92c3
2018-03-10 03:12:05 +00:00
Tao Bao 7800d71ad6 releasetools: Create StreamingPropertyFiles class.
am: cc8e2666ac

Change-Id: I715344de4fa0436f7091e0d16df992eff5aff537
2018-03-10 03:07:36 +00:00
Dan Willemsen 0a0181bb96 Merge "Use xz prebuilt"
am: 8e287901c3

Change-Id: Ie63abd01335f2565581faf32f1c235b5d7f24892
2018-03-10 03:05:54 +00:00
Treehugger Robot 8e287901c3 Merge "Use xz prebuilt" 2018-03-10 03:00:29 +00:00
Mathieu Chartier 1f1335ceeb Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""
Fixed the failing targets.

Bug: 74209329
Test: make

This reverts commit 0ecba4b139.

Change-Id: I4f346b8107ffaf6afbd551d91574ed040372635e
2018-03-09 18:03:49 -08:00
Nan Zhang debdbda27c Merge "Fix droiddoc variable name in clear_vars.mk" am: 6991c1a35d
am: 2bc83406a0

Change-Id: Ibb138cc393187038fd911fd3d6af3b2314cb1e27
2018-03-09 23:01:34 +00:00
Nan Zhang 2bc83406a0 Merge "Fix droiddoc variable name in clear_vars.mk"
am: 6991c1a35d

Change-Id: I5d5fc6958e65b69e35dafb47db746f7791cd836f
2018-03-09 22:55:58 +00:00
Treehugger Robot 6991c1a35d Merge "Fix droiddoc variable name in clear_vars.mk" 2018-03-09 22:33:50 +00:00
Tao Bao cc8e2666ac releasetools: Create StreamingPropertyFiles class.
This CL breaks down ComputeStreamingMetadata() into mutiple member
functions of StreamingPropertyFiles class, which correspond to the
two-pass logic when generating streaming property files (aka streaming
metadata).

StreamingPropertyFiles.Compute() does the work for the first pass, by
putting placeholders before doing initial signing. Finalize()
corresponds to the second pass, where the placeholders get replaced with
actual data. Verify() can be optionally called to assert the correctness
of the work.

The separation between Compute() and Finalize() is to allow having
multiple StreamingPropertyFiles instances (in coming up CLs). This way
we can call Compute() multiple times for each instance, followed by only
one call to SignOutput(). And similarly for Finalize().

Bug: 74210298
Test: Generate an A/B OTA package. Check the METADATA entry.
Test: python -m unittest test_ota_from_target_files
Change-Id: I45be0372a4863c4405e6d8e20bcb9ccdc29e7e11
(cherry picked from commit ae5e4c30fe)
2018-03-09 13:44:13 -08:00
Dan Willemsen 893859573d Use xz prebuilt
Instead of whichever xz happens to be on the PATH.

Bug: 36130900
Test: m
Change-Id: Ib37d8db4e935ef8f69f3d43b5065c22d34028cf3
2018-03-09 12:56:01 -08:00
Nan Zhang ccdecc7e02 Fix droiddoc variable name in clear_vars.mk
Test: m -j
Bug: b/70351683
Change-Id: I8cb4429a7e6bebde541a09f0328dddb937c0aced
2018-03-09 12:39:34 -08:00
Tao Bao a49b0446d7 Merge "releasetools: Create StreamingPropertyFiles class." am: 32dfa4914d
am: 934e04d1a3

Change-Id: I2a1c65d09ffc1f4231cec45874557c3e3af74444
2018-03-09 20:13:30 +00:00
Tao Bao 934e04d1a3 Merge "releasetools: Create StreamingPropertyFiles class."
am: 32dfa4914d

Change-Id: I10d430bd204ab08efe17410920c280bf8440db35
2018-03-09 20:07:16 +00:00
Treehugger Robot 32dfa4914d Merge "releasetools: Create StreamingPropertyFiles class." 2018-03-09 19:56:18 +00:00
Anton Hansson c02b8228e1 Merge changes from topic "enforce-pi-dev" into pi-dev
am: f6da011392  -s ours

Change-Id: I03b5215d5d3db31ad7b1e99d5339c5f1c5e18df7
2018-03-09 15:48:53 +00:00
Anton Hansson 41b4f3e3f0 Enforce specifying sdk/private for apps.
am: b88c0e04f8  -s ours

Change-Id: I9b9de243c3ec90001ba0e314949141bbea65f94a
2018-03-09 15:46:16 +00:00
Roland Levillain e5372a1881 Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"
This reverts commit 86a596c711.

Reverting as that commit breaks ART tests' results (see
b/73804944).

(cherry picked from commit 209b96e152)

Test: m test-art-host
Bug: 73804944
Bug: 26275726
Change-Id: I06af4b170d845d3e55e044c28ec22d4b3ca3dede
2018-03-09 14:33:41 +00:00
Anton Hansson f6da011392 Merge changes from topic "enforce-pi-dev" into pi-dev
* changes:
  Enforce specifying sdk/private for apps.
  Add more control to the java sdk enforcement.
2018-03-09 14:12:57 +00:00
Dan Willemsen 769b62568d Support a pre-extracted PDK zip
am: 389bbe45a2  -s ours

Change-Id: Iae639428c38ce00839990b855355a67830f9e746
2018-03-09 10:37:52 +00:00
Nan Zhang 2ebf9a629b Merge "Rename stubsjar to stubsSrcjar for droiddoc" am: d29f3e7026
am: 6123183ad5

Change-Id: I52405ffa8de09554d38b79bfa3e8a97ad7c89b89
2018-03-09 10:15:50 +00:00
Anton Hansson b88c0e04f8 Enforce specifying sdk/private for apps.
All apps in master comply with this now, but new offenders
are being added daily. This will ensure compliance going
forward.

Test: build/soong/build_test.bash
Bug: 73535841

Exempt-From-Owner-Approval: cp from master
Change-Id: If28049750a9787bf455f72402e624dbddf842253
Merged-In: Id3fbb502d26d91b64480fec74e241ba77fa0faff
2018-03-09 10:15:25 +00:00
Nan Zhang 6123183ad5 Merge "Rename stubsjar to stubsSrcjar for droiddoc"
am: d29f3e7026

Change-Id: I828a39593fb33ac4a6a210ee04dc58237fca14b7
2018-03-09 10:04:24 +00:00
Anton Hansson 7c3c9ef7de Add more control to the java sdk enforcement.
I plan on turning the error on for APPS in AOSP soon, and in preparation for
that I'm introducing a finer granularity of warning/error control.

Also add an almost-empty whitelist, which will likely need to be expanded
in the future.

Bug: 73535841
Test: make
Exempt-From-Owner-Approval: cp from aosp and master
Change-Id: I2fc6700a504b7af50aa7bde727047bc56b167937
Merged-In: I13ebe3ead2d19aa797bcc39a7bbccdb55b9c7d1c
Merged-In: I87c968b2e8314300b155483bbb7ce5e169fe8f0c
2018-03-09 09:52:44 +00:00
Treehugger Robot d29f3e7026 Merge "Rename stubsjar to stubsSrcjar for droiddoc" 2018-03-09 09:42:29 +00:00
Anton Hansson 23b7f385e8 Merge "Enforce specifying sdk/private for apps. DO NOT MERGE" am: 5a49a36a55 -s ours
am: 3ab72f26ff  -s ours

Change-Id: I87968675726d884340612f7d5d3a643ca445fa41
2018-03-09 09:31:21 +00:00
Anton Hansson 3ab72f26ff Merge "Enforce specifying sdk/private for apps. DO NOT MERGE"
am: 5a49a36a55  -s ours

Change-Id: I1d69f1430fba616ead707df855e11d28c9bf98a3
2018-03-09 09:25:51 +00:00
Anton Hansson 5a49a36a55 Merge "Enforce specifying sdk/private for apps. DO NOT MERGE" 2018-03-09 09:18:06 +00:00
Dan Willemsen 389bbe45a2 Support a pre-extracted PDK zip
Pre-extracting the zip files are more sustainable for git, so that
objects can be shared if unchanged, rather than the 900MB zip file
changing on every build.

This also has the advantage that we could put an Android.bp file inside
the PDK, and Soong would just pick it up.

Bug: 68767391
Test: Build mini_arm64 PDK with platform.zip
Test: Build mini_arm64 PDK with extracted zip file
Change-Id: I16db030a731aea55b69c1d6e2260dbd70b167544
Merged-In: I16db030a731aea55b69c1d6e2260dbd70b167544
(cherry picked from commit 0663f685c2)
2018-03-09 00:27:56 -08:00
Dan Willemsen 5a11a24234 Merge "Support a pre-extracted PDK zip" am: 1cfafdd9fc
am: d34cc3915c

Change-Id: I4996d7e056f48c128e8cf90679562562283d3e15
2018-03-09 05:08:10 +00:00
Dan Willemsen d34cc3915c Merge "Support a pre-extracted PDK zip"
am: 1cfafdd9fc

Change-Id: I5425a83e6a5c3969cdb63fe8f2a375c94e058892
2018-03-09 04:49:46 +00:00
Treehugger Robot 1cfafdd9fc Merge "Support a pre-extracted PDK zip" 2018-03-09 04:26:48 +00:00
Jiyong Park 3cd00742e1 Remove unnecessary link-type check
am: 0c7a14ab3c  -s ours

Change-Id: Ief53dc9988efb7505b01674af5218a8f2f7eae13
2018-03-09 02:54:55 +00:00
Nan Zhang 89f12b00f0 Rename stubsjar to stubsSrcjar for droiddoc
Test: m -j core-docs
Bug: b/70351683
Change-Id: I90e4df3ba002c7488f3a80066bf3723b6f299b04
2018-03-08 17:29:16 -08:00
Jiyong Park f8029e5fad Merge "Remove unnecessary link-type check" am: 0b4b321565
am: 04ca4e7e9a

Change-Id: I181bee4ac148973b5c024f9b4952e0f63c82dc68
2018-03-09 00:36:57 +00:00