openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
41,341 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

41341 Commits

Author SHA1 Message Date
Baligh Uddin 10882a317c Merge "Add generate_verity_key (+dependencies) to otatools package." am: c4f76d670a 
am: d60a86c3ca

Change-Id: I410319047ff19c0978e94a5a04e6a02083fccb24
 2017-12-18 20:47:35 +00:00
Baligh Uddin d60a86c3ca Merge "Add generate_verity_key (+dependencies) to otatools package." 
am: c4f76d670a

Change-Id: Ic6b4a610f9141446003826b325b5795cfc6e3fca
 2017-12-18 20:44:30 +00:00
Baligh Uddin c4f76d670a Merge "Add generate_verity_key (+dependencies) to otatools package." 2017-12-18 20:40:49 +00:00
Baligh Uddin c8bef14c9f Add generate_verity_key (+dependencies) to otatools package. 2017-12-18 10:40:57 -08:00
Steven Moreland 9874ee6c54 Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810 
am: a710d44086

Change-Id: I39b94bef18b12f0e55bc1d0eaabde2ba85f00146
 2017-12-18 17:57:42 +00:00
Steven Moreland a710d44086 Merge changes from topic "kati-obsolete-full-treble" 
am: 2b1f0d1810

Change-Id: Ie267f97dc3fdd884a7a780d346880b7ff02d5d2e
 2017-12-18 17:53:19 +00:00
Treehugger Robot 2b1f0d1810 Merge changes from topic "kati-obsolete-full-treble" 
* changes:
  .KATI_obsolete PRODUCT_FULL_TREBLE.
  PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
 2017-12-18 17:46:25 +00:00
Steven Moreland 5dcea5de76 .KATI_obsolete PRODUCT_FULL_TREBLE. 
It has been broken up into subflags, and usage has been cleaned up.

Bug: 69865032
Test: can't use PRODUCT_FULL_TREBLE
Change-Id: Ia38366a30132f129d09c6f4a985402c202bace62
 2017-12-18 17:45:55 +00:00
Dan Albert 892e4d3ec9 Merge "Depend on the more specific ndk timestamp." am: 6663c8476a 
am: f6c5be1e8e

Change-Id: I3186e73b7779979081cb6d2a81d34079d2d65218
 2017-12-16 03:22:34 +00:00
Dan Albert f6c5be1e8e Merge "Depend on the more specific ndk timestamp." 
am: 6663c8476a

Change-Id: I41d3e430221951b71f18aac395c91741e5a4f3e5
 2017-12-16 03:17:32 +00:00
Treehugger Robot 6663c8476a Merge "Depend on the more specific ndk timestamp." 2017-12-16 03:14:43 +00:00
Chih-Hung Hsieh 322f7fd374 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." am: 305d2abb27 
am: c1ddbf65be

Change-Id: I3bd0584158e60f67f7dcab5b9f6e02b54428811a
 2017-12-16 01:59:20 +00:00
Chih-Hung Hsieh c1ddbf65be Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." 
am: 305d2abb27

Change-Id: I9a2b41a5f894c29c80908774362211099fed0caf
 2017-12-16 01:56:43 +00:00
Treehugger Robot 305d2abb27 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." 2017-12-16 01:53:44 +00:00
Dan Albert 9b661597f6 Merge "Remove support for pre-r13 NDKs." am: 9d3270bd52 
am: 28cc8a9c83

Change-Id: I2695424c9de939c26432480d17cf01116b996af1
 2017-12-16 01:25:07 +00:00
Dan Albert 28cc8a9c83 Merge "Remove support for pre-r13 NDKs." 
am: 9d3270bd52

Change-Id: I49d1214fad8e8172d6c94cccf9fc559793b8cbad
 2017-12-16 01:22:06 +00:00
Treehugger Robot 9d3270bd52 Merge "Remove support for pre-r13 NDKs." 2017-12-16 01:15:29 +00:00
Colin Cross 0293f40441 Merge "Fix swapped certificate and private key in soong apps" am: 9b93a8892a 
am: 29e9b0f220

Change-Id: I9268bb95f0cbfc1b1054b9f51834d7f86e7581a8
 2017-12-16 00:16:18 +00:00
Colin Cross 6a825da3d9 Merge "Export app implementation and header jars" am: 1ea9c644c8 
am: e0beddc068

Change-Id: Ifecc3b40e86190d6c3a1fcd9886fd44c41cc5d63
 2017-12-16 00:14:51 +00:00
Colin Cross 29e9b0f220 Merge "Fix swapped certificate and private key in soong apps" 
am: 9b93a8892a

Change-Id: I7b46b950fd047deaa17609b54a4574e350324e98
 2017-12-16 00:11:52 +00:00
Colin Cross e0beddc068 Merge "Export app implementation and header jars" 
am: 1ea9c644c8

Change-Id: Iae8a6a9edb50ba0edf685ab5ddf7ececd5d57c3f
 2017-12-16 00:10:37 +00:00
Colin Cross 9b93a8892a Merge "Fix swapped certificate and private key in soong apps" 2017-12-16 00:04:07 +00:00
Colin Cross 1ea9c644c8 Merge "Export app implementation and header jars" 2017-12-16 00:00:24 +00:00
Tao Bao e6f267c4f3 Merge "releasetools: Use delta_generator to verify payload signatures." am: e58d385df1 
am: cbece24e6e

Change-Id: Id7dff799f84acc58008544b48e8b79d9cc2a1c21
 2017-12-15 23:49:43 +00:00
Tao Bao cbece24e6e Merge "releasetools: Use delta_generator to verify payload signatures." 
am: e58d385df1

Change-Id: I05be81115723eae838fce5a4a2d6e75b163bc769
 2017-12-15 23:45:06 +00:00
Chih-Hung Hsieh 6375b6d730 Call clang-tidy with -quiet unless WITH_TIDY is set. 
* Default builds calls clang-tidy only if enabled locally.
  In this case, clang-tidy should be quiet.
* If WITH_TIDY is 1 or true, let clang-tidy emit default messages.
* Even with -quiet and all warnings are suppressed,
  clang-tidy emits one line message of the number of suppressed messages.
  This one-liner could be suppressed in future changes.

Bug: 69051430
Test: default build and build with WITH_TIDY=1
Change-Id: I3138ef45fc4372f904787bd1a391e8d88050f0b3
 2017-12-15 15:41:14 -08:00
Treehugger Robot e58d385df1 Merge "releasetools: Use delta_generator to verify payload signatures." 2017-12-15 23:38:12 +00:00
Dan Shi 638fdf443b Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d 
am: f23aa88514

Change-Id: Icb61400f9c88588fecf557155987dceff89827e6
 2017-12-15 23:36:06 +00:00
Dan Shi f23aa88514 Merge "Create build artifact tradefed-tests_list.zip" 
am: 8c2007cf4d

Change-Id: If25c0ca75e49ae40af6eaa195019103841ee67d3
 2017-12-15 23:32:58 +00:00
Dan Albert 3d1d1ead79 Remove support for pre-r13 NDKs. 
We only have r16 checked in now.

Test: make native
Bug: None
Change-Id: I1600598cf86f803f9fdcf3fa5ada8d1871c98b65
 2017-12-15 15:25:06 -08:00
Treehugger Robot 8c2007cf4d Merge "Create build artifact tradefed-tests_list.zip" 2017-12-15 23:25:01 +00:00
Colin Cross 0b451358b9 Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" 
am: fcb0d149b4  -s ours

Change-Id: Ife7b7c8a6734b6141dfbd12d0891c96754cb87cd
 2017-12-15 23:04:21 +00:00
Steven Moreland ae69e5787a PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE 
- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
  doesn't need to be differentiated.

Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
 2017-12-15 14:52:07 -08:00
Tao Bao b1cc1ed1a7 Merge "releasetools: Remove the support for generating verify package." am: e2ffc8b887 
am: 12fafaccc0

Change-Id: I06cf6990379e5e92c33a151bdc6a96ca6fbb7528
 2017-12-15 22:08:56 +00:00
Tao Bao 12fafaccc0 Merge "releasetools: Remove the support for generating verify package." 
am: e2ffc8b887

Change-Id: I246ca42beb66e40a32af6dbfd5da61bcf4963433
 2017-12-15 22:06:15 +00:00
Tao Bao e2ffc8b887 Merge "releasetools: Remove the support for generating verify package." 2017-12-15 22:00:06 +00:00
Dan Albert b86ff3828a Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd 
am: 041ea591ae

Change-Id: I62e2cdbe3d88a60898140700e410f11592c48415
 2017-12-15 21:51:39 +00:00
Dan Albert 041ea591ae Merge "Revert "Default NDK modules to libc++_shared."" 
am: aec47c67cd

Change-Id: I87389aaa55fea26377441341c37e7cf5bcf4a71b
 2017-12-15 21:46:32 +00:00
Colin Cross 4e34ce054c Fix swapped certificate and private key in soong apps 
The .x509.pem file should be in CERTIFICATE, and the .pk8 file
in PRIVATE_KEY.

Bug: 70669383
Test: examine apkcerts.txt
Change-Id: I480f19be2efbbd72ea23ebd681f312b94accfd7a
 2017-12-15 13:41:24 -08:00
Colin Cross 75a698b394 Export app implementation and header jars 
Also fix a missing dependency on the jacoco-report-classes.jar

Test: m checkbuild
Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
 2017-12-15 13:41:24 -08:00
Treehugger Robot aec47c67cd Merge "Revert "Default NDK modules to libc++_shared."" 2017-12-15 21:39:29 +00:00
Tao Bao 750385e455 releasetools: Use delta_generator to verify payload signatures. 
We used to take a hard approach by parsing the payload with Python
script. This can be done by calling deleta_generator directly, which
also avoids the dependency on protobuf.

- Passing case
$ ./build/make/tools/releasetools/check_ota_package_signature.py \
    build/target/product/security/testkey.x509.pem \
    out/dist/aosp_marlin-ota-eng.zip

Package: out/dist/aosp_marlin-ota-eng.zip
Certificate: build/target/product/security/testkey.x509.pem
  ...
Whole package signature VERIFIED

Verifying A/B OTA payload signatures...
[1215/122842:INFO:generate_delta_main.cc(171)] Verifying signed payload.
[1215/122845:INFO:payload_verifier.cc(93)] signature blob size = 264
[1215/122845:INFO:payload_verifier.cc(112)] Verified correct signature 1 out of 1 signatures.
[1215/122845:INFO:payload_verifier.cc(93)] signature blob size = 264
[1215/122845:INFO:payload_verifier.cc(112)] Verified correct signature 1 out of 1 signatures.
[1215/122845:INFO:generate_delta_main.cc(181)] Done verifying signed payload.

Payload signatures VERIFIED

$ echo $?
0

- Failing case
Sign the whole package file with a different key, but leaving payload entries intact.

$ ./build/make/tools/releasetools/check_ota_package_signature.py \
    testkey2.x509.pem \
    marlin-ota-mismatching.zip
Package: marlin-ota-mismatching.zip
Certificate: testkey2.x509.pem
  ...
Whole package signature VERIFIED

Verifying A/B OTA payload signatures...
[1215/123054:INFO:generate_delta_main.cc(171)] Verifying signed payload.
[1215/123056:INFO:payload_verifier.cc(93)] signature blob size = 264
[1215/123056:ERROR:payload_verifier.cc(118)] None of the 1 signatures is correct. Expected:
[1215/123056:INFO:utils.cc(444)] Logging array of length: 256
[1215/123056:INFO:utils.cc(461)] 0x00000000 : 00 01 ff ff ff ff ff ff ff ff ff ff ff ff ff ff
  ...
[1215/123056:ERROR:payload_verifier.cc(121)] But found decrypted hashes:
[1215/123056:INFO:utils.cc(444)] Logging array of length: 256
[1215/123056:INFO:utils.cc(461)] 0x00000000 : 52 68 78 36 f6 9e cd 2d 5e 9f 31 d5 26 03 c9 aa
  ...
[1215/123056:ERROR:payload_signer.cc(333)] PayloadVerifier::VerifySignature( signature_blob, public_key_path, payload_hash) failed.
[1215/123056:INFO:generate_delta_main.cc(177)] VerifySignedPayload failed

    ERROR: Failed to verify payload with delta_generator: marlin-ota-mismatching.zip

$ echo $?
1

Bug: 65261072
Test: See above.
Change-Id: Id2e065655ec49b80dd2b13c6a859f41913be055b
 2017-12-15 12:45:09 -08:00
Steven Moreland a36a56b101 Merge "Remove Treble from soong_config.mk" am: b982d8b7ae 
am: c4ee99f4ca

Change-Id: I2c5aa73b40e73951b57bfda52382eaeaab756788
 2017-12-15 20:19:51 +00:00
Colin Cross fcb0d149b4 Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" 
This reverts commit 15a2fa21a8.

This reapplies I83f3d45bdd156200308dc7ed0e0fea5d895d37a6 without
the error on absolute paths if they are in $(OUT_DIR).

BUG: 68305853
Test: OUT_DIR=/tmp/out mmma -j art/tools/ahat
Change-Id: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
Merged-In: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
 2017-12-15 20:19:38 +00:00
Steven Moreland c4ee99f4ca Merge "Remove Treble from soong_config.mk" 
am: b982d8b7ae

Change-Id: I50c9400d9fb620d509304af58fc908fe2099e870
 2017-12-15 20:14:44 +00:00
Treehugger Robot b982d8b7ae Merge "Remove Treble from soong_config.mk" 2017-12-15 20:07:21 +00:00
Dan Albert 37099686c0 Revert "Default NDK modules to libc++_shared." 
This reverts commit 6168f5baf1.

Reason for revert: http://b/70718590

Change-Id: I3e7afe3d1642260c2b5103cb07c636b0b5d72379
 2017-12-15 20:01:03 +00:00
Joe Onorato b1eab6100d Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." am: fa839296ea 
am: 3f443418f7  -s ours

Change-Id: I920d8c41d293b19936946d91d0c78fc72c71b0ad
 2017-12-15 19:53:18 +00:00
Joe Onorato 3f443418f7 Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." 
am: fa839296ea

Change-Id: Ibc8c2d2236d0b8cc1d77f741784a323171a07db5
 2017-12-15 19:47:17 +00:00
Joe Onorato fa839296ea Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." 2017-12-15 19:39:46 +00:00