Commit Graph

43543 Commits

Author SHA1 Message Date
Treehugger Robot
9f573a420e Merge "Replace $(shell find | sort) with $(sort $(shell find))" 2018-02-06 21:21:08 +00:00
Stephen Hines
45f4db3859 Merge "Switch to clang-4579689." am: f733f896d3 am: 9144cd3fe6
am: 50a02c420c

Change-Id: Idfc71f17bcc51554717dc46b9e80c07415df193b
2018-02-06 19:10:27 +00:00
Stephen Hines
50a02c420c Merge "Switch to clang-4579689." am: f733f896d3
am: 9144cd3fe6

Change-Id: I8075c412cd42ff7a0e4695ec519cfbc555d368df
2018-02-06 19:03:41 +00:00
Stephen Hines
9144cd3fe6 Merge "Switch to clang-4579689."
am: f733f896d3

Change-Id: I33624821fa84d1b0411901bc717c39087c40ab7e
2018-02-06 18:53:22 +00:00
Stephen Hines
f733f896d3 Merge "Switch to clang-4579689." 2018-02-06 18:35:41 +00:00
Tao Bao
3b45d28ff6 Merge "releasetools: Capture stderr output when calling delta_generator." am: 26fc64da06 am: 1f49ccfd61
am: 58e79345f3

Change-Id: Ife6761f4f0891ee8377721ea9e4478c233b6cc37
2018-02-06 17:35:19 +00:00
Tao Bao
58e79345f3 Merge "releasetools: Capture stderr output when calling delta_generator." am: 26fc64da06
am: 1f49ccfd61

Change-Id: I689d61b9ee186f01be4dd57a5cd1dbbdd530ea9b
2018-02-06 17:31:02 +00:00
Tao Bao
1f49ccfd61 Merge "releasetools: Capture stderr output when calling delta_generator."
am: 26fc64da06

Change-Id: Ie31820c3fc46aa3dba3053d330f885fd7d9953aa
2018-02-06 17:26:53 +00:00
Tao Bao
26fc64da06 Merge "releasetools: Capture stderr output when calling delta_generator." 2018-02-06 17:20:53 +00:00
James Lemieux
e61ffeb90b Merge "Clear local robolectric testing variables" am: 08ba09ed7f am: 815658efe9
am: 1e321d46a6

Change-Id: I9336f4ad9f47b437acaf09757a7820a7c23ff75f
2018-02-06 17:09:41 +00:00
James Lemieux
1e321d46a6 Merge "Clear local robolectric testing variables" am: 08ba09ed7f
am: 815658efe9

Change-Id: I09a955583e13744bc5f5d4a4c7ee16d2f8807a4f
2018-02-06 17:05:30 +00:00
James Lemieux
815658efe9 Merge "Clear local robolectric testing variables"
am: 08ba09ed7f

Change-Id: I3ea21d918c8622afa7ef0f22fa3caaa9743d6c08
2018-02-06 17:01:23 +00:00
Treehugger Robot
08ba09ed7f Merge "Clear local robolectric testing variables" 2018-02-06 16:55:09 +00:00
Søren Gjesse
52dd2f8f8e Enable R8 by default (sixth attempt)
Fixed bugs which was discovered in the last attempt.

Bug: 72373167
Bug: 72391662

Test: m -j PRODUCT-taimen-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I89aaed9a4156748a513d6ee0284068b8a3c52322
2018-02-06 17:30:32 +01:00
hansson
57c4dd849d Merge "Add a base makefile for 64 bit only builds." am: ee00360292 am: bd5bb92f81
am: 05692c2dca

Change-Id: I4fe1d9c42dcaca433b1bfd2af122bd23f0a8c9fd
2018-02-06 10:24:19 +00:00
hansson
05692c2dca Merge "Add a base makefile for 64 bit only builds." am: ee00360292
am: bd5bb92f81

Change-Id: I8ad948162f07246f670374474d9eafb0396c915a
2018-02-06 10:20:16 +00:00
hansson
bd5bb92f81 Merge "Add a base makefile for 64 bit only builds."
am: ee00360292

Change-Id: If7498714a3c669278224fef295c99c6e0ef37d32
2018-02-06 10:15:39 +00:00
hansson
ee00360292 Merge "Add a base makefile for 64 bit only builds." 2018-02-06 10:08:48 +00:00
Tao Bao
3f15ada51b releasetools: Capture stderr output when calling delta_generator.
Prior to this CL, the call to delta_generator in
check_ota_package_signature.VerifyAbOtaPayload() didn't redirect stderr.
The logs (mostly INFO) on successful verification added noise to the
normal output, which also upset the unittest result parser.

This CL captures stderr outputs from delta_generator, and will only dump
them on error.

Bug: 72884343
Test: `python -m unittest -v test_ota_from_target_files > /dev/null`
      gives clean output.
Test: Inject error into delta_generator. The call to
      check_ota_package_signature correctly dumps both of stdout and
      stderr outputs.
Change-Id: I014a4b21bf758dcf0a4b9963259d6019851935ee
2018-02-05 23:39:23 -08:00
Dan Willemsen
be0b6cee4f Replace $(shell find | sort) with $(sort $(shell find))
Kati's find emulator doesn't understand "| sort", so use use the make
function instead so that we can emulate the find commands.

 before: *kati*: shell time (regen): 1.316989 / 187
 after:  *kati*: shell time (regen): 1.249748 / 184

The time has a lot of variance, the important change is the reduction in
number of shell commands. Kati has other issues with some of these (it
doesn't support find's implicit -a), which is why it only goes down by
3. I'll be fixing Kati separately to handle those cases.

Test: diff out/build-aosp_taimen.ninja before&after
Change-Id: I5c8c2993f01a8a6af84963e903a8a0c186a61e82
2018-02-05 23:07:58 -08:00
Yifan Hong
2c2a24421a Merge "Move system manifest / device matrix build rules" am: fe34c5b52c am: 6e79817411
am: 19687f25f0

Change-Id: I897635ade816d146f41ef3a3421e16446e9d0252
2018-02-06 02:29:27 +00:00
Tao Bao
22f78fcf61 Merge "releasetools: Fix an issue with pubkey extraction." am: ca2ffed06c am: 8a05f343c2
am: 4c67bb3a13

Change-Id: I306105a5e2266de39a98a197eaa0a5584ad7fbd5
2018-02-06 02:28:40 +00:00
Yifan Hong
19687f25f0 Merge "Move system manifest / device matrix build rules" am: fe34c5b52c
am: 6e79817411

Change-Id: I1590e890c63218451c4ecf56d5526c9edda38e1d
2018-02-06 02:21:50 +00:00
Tao Bao
4c67bb3a13 Merge "releasetools: Fix an issue with pubkey extraction." am: ca2ffed06c
am: 8a05f343c2

Change-Id: Ief767e449ecfcb01f82aed47bfd6f0e603dae77f
2018-02-06 02:21:04 +00:00
goneil
3f6ad60933 Added SimAppDialog to the list of core packages
We need this new project to be part of the core packages installed on
system images in order to allow for installation of carrier apps
when a SIM is inserted and the carrier app is not present.

Bug: 70906683
Test: Manual install and activation
Change-Id: I1a95ce57034fd6af9d19cf73f0b7346d76a7c727
2018-02-05 17:13:27 -08:00
Yifan Hong
9bf93017d4 core/config.mk: Add PLATFORM_SEPOLICY_COMPAT_VERSIONS
This is a list of sepolicy versions that the framework supports.

Test: build framework compatibility matrix
Test: boots

Bug: 67920434
Change-Id: I82365742172b653eadb7b5315398e06cace4e000
2018-02-05 15:55:11 -08:00
Yifan Hong
8f4547cde9 Move PLATFORM_SEPOLICY_VERSION from system/sepolicy/Android.mk
Test: builds
Bug: 67920434
Change-Id: I3b29fd188e755039a1fcf4814c578a2220567bf1
2018-02-05 15:55:11 -08:00
James Lemieux
bb426739ce Clear local robolectric testing variables
This prevents them from mistakenly bleeding between test targets.

Bug: 72384841
Test: make Run_TeleService_robotests
Change-Id: Ie2c047be1450420f8e27b8b45e9416e96b477b45
2018-02-05 15:39:18 -08:00
Yifan Hong
6e79817411 Merge "Move system manifest / device matrix build rules"
am: fe34c5b52c

Change-Id: If9873f37745d4f1ea4c567d9774c64b5e37a4dcd
2018-02-05 23:37:16 +00:00
Tao Bao
8a05f343c2 Merge "releasetools: Fix an issue with pubkey extraction."
am: ca2ffed06c

Change-Id: Ibd9014ec04e26e018fcb4602a42b204941af13b6
2018-02-05 23:35:38 +00:00
Treehugger Robot
fe34c5b52c Merge "Move system manifest / device matrix build rules" 2018-02-05 22:27:18 +00:00
Tao Bao
f7140c0f8c releasetools: Support packaging secondary payload.
By default, an A/B OTA package doesn't contain the images for the
secondary slot (e.g. system_other.img). Specifying
"--include_secondary" that's introduced in this CL allows generating
a separate payload that will install secondary slot images. Both
payloads will be added to the generated A/B OTA package.

An example A/B OTA package with secondary payload
  |
  +-- payload.bin
  |
  +-- payload_properties.txt
  |
  +-- secondary/payload.bin
  |
  +-- secondary/payload_properties.txt
  |
  +-- ...

Such a package needs to be applied in a two-stage manner. During the
first stage, the updater applies the primary payload only. Upon
finishing, it reboots the device into the newly updated slot. It then
continues to install the secondary payload to the inactive slot, but
without switching the active slot at the end (needs the matching support
in update_engine, i.e. SWITCH_SLOT_ON_REBOOT flag).

Due to the special install procedure, the secondary payload will be
always generated as a full payload.

Bug: 35724498
Test: Generate full and incremental OTAs with --include_secondary. Check
      the generated OTAs.
Test: python -m unittest test_ota_from_target_files
Change-Id: I975e826bec492e86eb400f99de0c355a32420127
2018-02-05 13:28:52 -08:00
Treehugger Robot
ca2ffed06c Merge "releasetools: Fix an issue with pubkey extraction." 2018-02-05 21:25:47 +00:00
Carmen Jackson
152118d631 Merge "Add Traceur to user builds." am: a3a211dafe am: 5de6e57714
am: 3c4dd281d0

Change-Id: I8b1ffbfba434a453d7576993022a9121320f76fe
2018-02-05 20:52:36 +00:00
Carmen Jackson
3c4dd281d0 Merge "Add Traceur to user builds." am: a3a211dafe
am: 5de6e57714

Change-Id: I9c237fb287a9b782446d736bb9d41c8b86a3c8d9
2018-02-05 20:48:33 +00:00
Carmen Jackson
5de6e57714 Merge "Add Traceur to user builds."
am: a3a211dafe

Change-Id: I416a881dcff5ad59d2c301b82261f71b55629f2e
2018-02-05 20:40:53 +00:00
Treehugger Robot
a3a211dafe Merge "Add Traceur to user builds." 2018-02-05 20:31:23 +00:00
Anton Hansson
1ac8a6df9a Add a base makefile for 64 bit only builds.
This makefile specifies a configuration that only starts a 64 bit
zygote (as opposed to both 64/32, as standard 64 bit builds do).
It should be inherited by products that only supports 64 bit apps.

Bug: 72810053
Test: Manual, using product in https://android-review.googlesource.com/608276
Change-Id: Ib88eccf8d4c575bfd93d6edb130348aeca4ae3f8
2018-02-05 18:24:16 +00:00
Bowgo Tsai
66f0285f4d Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 8b35ac67b2 am: 7d4299612b
am: 310f79ae18

Change-Id: I5a0101b1552f20b492bb94b3f5a5f2d6e6642306
2018-02-05 17:53:06 +00:00
Bowgo Tsai
310f79ae18 Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 8b35ac67b2
am: 7d4299612b

Change-Id: I422ba433034a4b5746029f224b271da3cdceafea
2018-02-05 17:49:57 +00:00
Bowgo Tsai
7d4299612b Merge "Renames sepolicy files from nonplat_* to vendor_*"
am: 8b35ac67b2

Change-Id: Ib517d7fa5843efab43bac8fd66a2db35efaa58da
2018-02-05 17:43:47 +00:00
Tao Bao
891ee8af2d Merge "releasetools: Add sdk and security patch level info to metadata." am: 993e1d2634 am: d00a176e22
am: 1ca91dae98

Change-Id: Ic9e823cb13bf10e48b87a2290dff0deef3f3eb77
2018-02-05 17:35:36 +00:00
Tao Bao
1ca91dae98 Merge "releasetools: Add sdk and security patch level info to metadata." am: 993e1d2634
am: d00a176e22

Change-Id: I16652f7b351200c705c1a5154bf31d150ce5f719
2018-02-05 17:32:27 +00:00
Treehugger Robot
8b35ac67b2 Merge "Renames sepolicy files from nonplat_* to vendor_*" 2018-02-05 17:31:45 +00:00
Tao Bao
d00a176e22 Merge "releasetools: Add sdk and security patch level info to metadata."
am: 993e1d2634

Change-Id: Ieecf7ab13bad1e9022861a6e973db81139101413
2018-02-05 17:28:19 +00:00
Treehugger Robot
993e1d2634 Merge "releasetools: Add sdk and security patch level info to metadata." 2018-02-05 17:25:16 +00:00
Bowgo Tsai
09f88a6b88 Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: boot bullhead/taimen
2018-02-05 18:22:45 +08:00
Tao Bao
04e1f012dd releasetools: Fix an issue with pubkey extraction.
When calling 'openssl x509 -pubkey' to extract the public key from a
certificate, openssl 1.0 and 1.1 handle the '-out' parameter
differently. openssl 1.0 doesn't write the output into the specified
filename, which leads to the payload verification failure in
check_ota_package_signature.VerifyAbOtaPayload(). This CL addresses
the issue by always collecting the output from stdout instead.

It also refactors the two copies into common.ExtractPublicKey(), and
adds unittest. get_testdata_dir() is moved into test_utils.py that holds
common utils for running the unittests.

Bug: 72884343
Test: python -m unittest test_common
Test: python -m unittest test_ota_from_target_files
Test: Run sign_target_files_apks with '--replace_ota_keys' on marlin
      target_files zip. Check the payload pubkey replacement.
Test: Trigger the tests with forrest, and tests no longer fail on
      machines with openssl 1.0.1.
Change-Id: Ib0389b360f064053e9aa7cc0546d718e7b23003b
2018-02-04 13:59:52 -08:00
Bowgo Tsai
90f5adfbbf Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 8a6ab0f240 am: 6703b82a0c
am: 5d4cc6de47

Change-Id: Ibe09ff8507355ba58dfd8e5d76d518fc6cc34b34
2018-02-03 10:13:22 +00:00
Bowgo Tsai
5d4cc6de47 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 8a6ab0f240
am: 6703b82a0c

Change-Id: I35f529f1d76418f123ba75e1ca8f42712377e016
2018-02-03 10:09:47 +00:00