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
8220e0165b
Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: fcb0d149b4 -s ours
...
am: 0b451358b9
2017-12-15 23:12:39 +00:00
Colin Cross
0b451358b9
Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""
...
am: fcb0d149b4
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
5029b5f2e3
Merge "releasetools: Remove the support for generating verify package." am: e2ffc8b887 am: 12fafaccc0
...
am: b1cc1ed1a7
2017-12-15 22:13:21 +00:00
Tao Bao
b1cc1ed1a7
Merge "releasetools: Remove the support for generating verify package." am: e2ffc8b887
...
am: 12fafaccc0
2017-12-15 22:08:56 +00:00
Tao Bao
12fafaccc0
Merge "releasetools: Remove the support for generating verify package."
...
am: e2ffc8b887
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
6cb1602e1c
Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd am: 041ea591ae
...
am: b86ff3828a
2017-12-15 21:57:04 +00:00
Dan Albert
b86ff3828a
Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd
...
am: 041ea591ae
2017-12-15 21:51:39 +00:00
Dan Albert
041ea591ae
Merge "Revert "Default NDK modules to libc++_shared.""
...
am: aec47c67cd
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
f4cff27f37
Merge "Remove Treble from soong_config.mk" am: b982d8b7ae am: c4ee99f4ca
...
am: a36a56b101
2017-12-15 20:24:56 +00:00
Steven Moreland
a36a56b101
Merge "Remove Treble from soong_config.mk" am: b982d8b7ae
...
am: c4ee99f4ca
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
2017-12-15 20:19:38 +00:00
Steven Moreland
c4ee99f4ca
Merge "Remove Treble from soong_config.mk"
...
am: b982d8b7ae
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 6168f5baf1http://b/70718590
Change-Id: I3e7afe3d1642260c2b5103cb07c636b0b5d72379
2017-12-15 20:01:03 +00:00
Joe Onorato
08e1f778a1
Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." am: fa839296ea am: 3f443418f7 -s ours
...
am: b1eab6100d
2017-12-15 19:59:05 +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
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
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
Bo Hu
5c0d494425
Merge "emulator: disable location service" am: d9ee7467fd am: 02ade23601
...
am: 3c3992fbb3
2017-12-15 19:28:42 +00:00
Bo Hu
3c3992fbb3
Merge "emulator: disable location service" am: d9ee7467fd
...
am: 02ade23601
2017-12-15 19:26:08 +00:00
Bo Hu
02ade23601
Merge "emulator: disable location service"
...
am: d9ee7467fd
2017-12-15 19:22:07 +00:00
Yifan Hong
1947f5576a
Merge changes from topic "fcm_version" am: b1b5a0969b am: 5ac5e6b757
...
am: 23373452d4
2017-12-15 19:18:35 +00:00
Bo Hu
d9ee7467fd
Merge "emulator: disable location service"
2017-12-15 19:14:20 +00:00
Yifan Hong
23373452d4
Merge changes from topic "fcm_version" am: b1b5a0969b
...
am: 5ac5e6b757
2017-12-15 19:13:04 +00:00
Yifan Hong
5ac5e6b757
Merge changes from topic "fcm_version"
...
am: b1b5a0969b
2017-12-15 19:05:07 +00:00
Yifan Hong
f663d1ca4d
Merge "Rename VINTF XML module names" am: d8d276c5a6 am: fcdf772f67
...
am: d2c5a38dcb
2017-12-15 19:00:02 +00:00
Yifan Hong
b1b5a0969b
Merge changes from topic "fcm_version"
...
* changes:
Move fwk comp mat level logic into assemble_vintf
PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-15 18:58:34 +00:00
Yifan Hong
d2c5a38dcb
Merge "Rename VINTF XML module names" am: d8d276c5a6
...
am: fcdf772f67
2017-12-15 18:57:28 +00:00
Yifan Hong
fcdf772f67
Merge "Rename VINTF XML module names"
...
am: d8d276c5a6
2017-12-15 18:53:52 +00:00
Treehugger Robot
d8d276c5a6
Merge "Rename VINTF XML module names"
2017-12-15 18:46:20 +00:00
TreeHugger Robot
0adda3d526
Merge "emulator: disable location service"
2017-12-15 18:31:35 +00:00
Steven Moreland
60b0f06d9b
Remove Treble from soong_config.mk
...
This variable has been broken up into smaller components.
Bug: 62019611
Test: nothing uses it
Change-Id: Ic985e42179df24a43d9a0d0047a31ecd3bf35ec7
2017-12-15 10:26:52 -08:00
Tao Bao
0c6a414fff
releasetools: Remove the support for generating verify package.
...
We used to have "--gen_verify" that would generate a verify package for
non-A/B devices. Since a) we don't have active users; b) it works with
non-A/B only; c) we have better alternatives (e.g. using fastboot to
compute the partition checksum), this CL removes the support.
Test: `m dist`
Change-Id: Ib4a2c8c2a0394b54e66c106089aa52a0b900f034
2017-12-15 10:20:52 -08:00
Steven Moreland
e282e55911
Merge "Expose Treble requirement variables in Soong." am: 4b7ab33f4e am: 3b6bec05b2
...
am: 7c78b36d96
2017-12-15 17:57:08 +00:00
Steven Moreland
7c78b36d96
Merge "Expose Treble requirement variables in Soong." am: 4b7ab33f4e
...
am: 3b6bec05b2
2017-12-15 17:51:12 +00:00
Steven Moreland
3b6bec05b2
Merge "Expose Treble requirement variables in Soong."
...
am: 4b7ab33f4e
2017-12-15 17:45:43 +00:00
Treehugger Robot
4b7ab33f4e
Merge "Expose Treble requirement variables in Soong."
2017-12-15 17:41:28 +00:00
Tao Bao
386bec6f65
Merge "releasetools: Add common.ZipDelete()." am: 23f7ea9e70 am: 2bc1b967c1
...
am: 30e4e2d154
2017-12-15 16:48:30 +00:00
Tao Bao
30e4e2d154
Merge "releasetools: Add common.ZipDelete()." am: 23f7ea9e70
...
am: 2bc1b967c1
2017-12-15 16:45:25 +00:00
Tao Bao
2bc1b967c1
Merge "releasetools: Add common.ZipDelete()."
...
am: 23f7ea9e70
2017-12-15 16:42:50 +00:00
Joe Onorato
bfc7811441
When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
...
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.
Test: make
Merged-In: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-15 08:40:48 -08:00
Tao Bao
23f7ea9e70
Merge "releasetools: Add common.ZipDelete()."
2017-12-15 16:36:55 +00:00
