Commit Graph

32534 Commits

Author SHA1 Message Date
Tao Bao
e8468634be Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
am: 5ce7034463

Change-Id: If2a3ee497124b87d1ff3c6bb10a05065c856bd96
2017-01-25 01:49:00 +00:00
Tao Bao
5ce7034463 Merge "Revert "releasetools: Generate streamable A/B OTA packages."" 2017-01-25 01:45:45 +00:00
Tao Bao
ea4325baf8 Revert "releasetools: Generate streamable A/B OTA packages."
This reverts commit ef1bb4360f.

It has broken the builds that don't have care_map.txt entry.

Change-Id: I343455e66be5e79457968dfc2813c7c1c234b6dc
2017-01-25 01:41:13 +00:00
Tao Bao
62bc5301ec Merge "releasetools: Generate streamable A/B OTA packages."
am: 41130f495f

Change-Id: I33e4eb9cc536c7d49535a4c393a6b3303add9742
2017-01-24 23:59:24 +00:00
Tao Bao
41130f495f Merge "releasetools: Generate streamable A/B OTA packages." 2017-01-24 23:55:53 +00:00
Hiroshi Yamauchi
7254e730a9 Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
am: 131731fd49

Change-Id: I434953132243db254adf8513240e33257b917b21
2017-01-24 22:20:19 +00:00
Calin Juravle
9be4363048 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
am: eddf3adec7

Change-Id: I3405653797259f6529e1fd4e10434a435a3365fd
2017-01-24 22:19:32 +00:00
Hiroshi Yamauchi
131731fd49 Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." 2017-01-24 22:14:43 +00:00
Calin Juravle
eddf3adec7 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" 2017-01-24 22:14:11 +00:00
Evgenii Stepanov
9e8e3de9d8 Merge "Force Thumb for CFI targets."
am: 34eb9f7f60

Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
2017-01-24 20:54:57 +00:00
Evgenii Stepanov
e729e804fe Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
am: 96c81711c1

Change-Id: I914f2c1e037ad8988181801f7689636952beb5b2
2017-01-24 20:54:42 +00:00
Evgenii Stepanov
34eb9f7f60 Merge "Force Thumb for CFI targets." 2017-01-24 20:52:26 +00:00
Evgenii Stepanov
96c81711c1 Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." 2017-01-24 20:50:37 +00:00
Hiroshi Yamauchi
bf6ad34962 Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug: 34084559
Bug: 34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
2017-01-24 11:15:32 -08:00
Evgenii Stepanov
e1b96f3ae5 Run $(AR) with LLVMgold.so plugin for CFI targets.
Bug: 34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1
2017-01-23 17:02:22 -08:00
Evgenii Stepanov
81bea1bd40 Force Thumb for CFI targets.
Bug: 22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
2017-01-20 14:13:25 -08:00
Tao Bao
ef1bb4360f releasetools: Generate streamable A/B OTA packages.
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.

We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.

payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.

Bug: 33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
      entry in the metadata file.

Change-Id: I04504e834eb36e18876c5f5a5a09289ee05c6f9a
2017-01-19 22:25:12 -08:00
Vishwath Mohan
3ca34aeb7e Merge "Hide CFI behind a global flag."
am: 2d7fb30207

Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
2017-01-20 01:45:43 +00:00
Vishwath Mohan
1bd8984ace Merge "Hide CFI behind a global flag."
am: c0bf85a615

Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
2017-01-20 01:45:37 +00:00
Vishwath Mohan
2d7fb30207 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Vishwath Mohan
c0bf85a615 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Dan Willemsen
4f87826d23 Merge "Support native test prebuilts for X86+ARM builds"
am: bf28f5933a

Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
2017-01-20 01:09:34 +00:00
Treehugger Robot
bf28f5933a Merge "Support native test prebuilts for X86+ARM builds" 2017-01-20 00:59:42 +00:00
Vishwath Mohan
a5ff3e4133 Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
2017-01-19 14:35:31 -08:00
Colin Cross
d4aba70550 Merge "Don't pass empty arguments to ninja"
am: f8acdc50fa

Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
2017-01-19 06:48:21 +00:00
Treehugger Robot
f8acdc50fa Merge "Don't pass empty arguments to ninja" 2017-01-19 06:43:46 +00:00
Colin Cross
524c868107 Don't pass empty arguments to ninja
Passing an empty argument in argv to ninja results in an error:
ninja: error: empty path

Don't add jarg to the argument list if it is empty.

Bug: 34392351
Test: m -j
Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
2017-01-18 21:12:28 -08:00
Vishwath Mohan
8dcfdcebe9 Hide CFI behind a global flag.
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: If4508ba448bd4260020483f9c11ee849bb419713
2017-01-18 18:04:00 -08:00
Colin Cross
57de869060 Merge "Convert -j to a reasonable parallelism for kati"
am: bb5c13d359

Change-Id: Id3c6a55e0d6feb91d928a01ffd0875b574a8e5fb
2017-01-19 00:12:27 +00:00
Treehugger Robot
bb5c13d359 Merge "Convert -j to a reasonable parallelism for kati" 2017-01-19 00:08:40 +00:00
Josh Gao
7cf55a4581 Merge "Add crash_dump and tombstoned products."
am: 6651199eeb

Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
2017-01-18 23:16:55 +00:00
Josh Gao
6651199eeb Merge "Add crash_dump and tombstoned products." 2017-01-18 23:04:09 +00:00
Colin Cross
ba55c623cb Convert -j to a reasonable parallelism for kati
When running makeparallel in non-ninja mode, which is used when running
kati with USE_GOMA=true, convert -j to a reasonable parallelism value
the same way ninja does.

Bug: 34392351
Test: make -C build/make/tools/makeparallel makeparallel_test
Change-Id: I9aee4dd2a3b0f2b1c2c10087be83f7b2b06f4368
2017-01-18 14:50:50 -08:00
Jorim Jaggi
27b7101c6c Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am: ce0bae2f47

Change-Id: I230c5966278be38339fd369075be30320d27bcd2
2017-01-18 16:42:00 +00:00
Jorim Jaggi
b909e2c1aa Revert "SELinux: split property_contexts into platform and non-platform components."
am: 8cbd925748

Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496
2017-01-18 16:41:33 +00:00
Jorim Jaggi
ce0bae2f47 Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" 2017-01-18 16:33:32 +00:00
Jorim Jaggi
8cbd925748 Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit c5ffdd4bb4.

Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
2017-01-18 15:37:30 +00:00
Sandeep Patil
cb0a92be8b Merge "SELinux: split property_contexts into platform and non-platform components."
am: f91d163625

Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
2017-01-18 06:17:24 +00:00
Sandeep Patil
a94ae916ce SELinux: split property_contexts into platform and non-platform components.
am: c5ffdd4bb4

Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
2017-01-18 06:12:26 +00:00
Treehugger Robot
f91d163625 Merge "SELinux: split property_contexts into platform and non-platform components." 2017-01-18 06:09:02 +00:00
Sandeep Patil
bbf5e0b99b Merge "SELinux: split service_contexts into platform and non-platform components."
am: a91d63fa65

Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
2017-01-18 00:41:38 +00:00
Sandeep Patil
c5ffdd4bb4 SELinux: split property_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-18 00:41:15 +00:00
Sandeep Patil
0068df10f6 SELinux: split service_contexts into platform and non-platform components.
am: e4ade08f63

Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
2017-01-18 00:41:03 +00:00
Treehugger Robot
a91d63fa65 Merge "SELinux: split service_contexts into platform and non-platform components." 2017-01-18 00:36:56 +00:00
Dan Willemsen
d79dde610e Support native test prebuilts for X86+ARM builds
This allows Soong native tests to be built and installed on these
builds.

Bug: 32177952
Test: m -j bionic-unit-tests
Change-Id: Ifbe39ba7a8991cb87d10c5da679992cf3065444e
2017-01-17 14:19:50 -08:00
Josh Gao
e6b2ddaf69 Add crash_dump and tombstoned products.
Bug: http://b/30705528
Change-Id: I3f6c98f6f907f93e082db085a122557fc8488c83
2017-01-17 13:55:18 -08:00
Calin Juravle
b6fe87137c Add dexoptanalyzer to art PRODUCT_PACKAGES
Test: build & boot
Bug: 32871170
Change-Id: Iae89984ef3df253c75f400e68f00b24fcc2b82d5
2017-01-17 12:46:34 -08:00
Connor O'Brien
80daf82c0b Merge "Pass flash erase & logical block size to mke2fs"
am: cf4f7eac85

Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629
2017-01-17 20:13:33 +00:00
Connor O'Brien
cf4f7eac85 Merge "Pass flash erase & logical block size to mke2fs" 2017-01-17 20:07:11 +00:00
Sandeep Patil
e4ade08f63 SELinux: split service_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I6fec8d9b3023de09d69198c9e72311a1f03fe844
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-17 04:39:00 +00:00