Commit Graph

33595 Commits

Author SHA1 Message Date
Sandeep Patil ca38726337 Merge "SELinux: split property_contexts into platform and non-platform components." 2017-01-30 19:16:17 +00:00
Sandeep Patil b0481560e4 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: I1932684f600dd34d5136e72ac053fae13f0c3eba
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-26 15:30:31 -08:00
Chih-Hung Hsieh 478210f500 Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339 am: 3dadeece2a
am: 9d581bbcdb

Change-Id: I4eaa1d0c11b1e4659405c022e460d042090c89ac
2017-01-26 20:29:16 +00:00
Chih-Hung Hsieh 9d581bbcdb Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339
am: 3dadeece2a

Change-Id: I1da666f886eb051ddedde1d5db8823ffd58ee8a2
2017-01-26 20:26:45 +00:00
Chih-Hung Hsieh 3dadeece2a Merge "Put back LLVM_PREBUILTS_BASE."
am: c921add339

Change-Id: I06e11c06dfa37b9ef9419cbc0de35a4026ee5bf7
2017-01-26 20:23:47 +00:00
Treehugger Robot c921add339 Merge "Put back LLVM_PREBUILTS_BASE." 2017-01-26 20:16:14 +00:00
Yifan Hong 21a7e626f2 Merge "Add lshal to embedded.mk." am: cbc8f16656 am: 1a375ded9a
am: 1030be9543

Change-Id: I3e1458a8d4b4938dfdbe657303847bb743184138
2017-01-26 18:29:14 +00:00
Yifan Hong 1030be9543 Merge "Add lshal to embedded.mk." am: cbc8f16656
am: 1a375ded9a

Change-Id: Ie627b77505bfcd27ec2a08e847f58b5a13b2de7f
2017-01-26 18:25:44 +00:00
Chih-Hung Hsieh 614b3a52ea Put back LLVM_PREBUILTS_BASE.
Without this, WITH_TIDY is disabled because
PATH_TO_CLANG_TIDY uses LLVM_PREBUILTS_BASE.

Test: build with WITH_TIDY=1
Change-Id: I607ae45550f4574b3cee8e91c3d5b7eaa5f0a96c
2017-01-26 10:23:54 -08:00
Yifan Hong 1a375ded9a Merge "Add lshal to embedded.mk."
am: cbc8f16656

Change-Id: I675717ad530ba111d3b8cab1b79a6325a7232c02
2017-01-26 18:22:52 +00:00
Yifan Hong cbc8f16656 Merge "Add lshal to embedded.mk." 2017-01-26 18:18:20 +00:00
Yifan Hong 7dbae043ff Add lshal to embedded.mk.
Test: make -j64 and flash the device and
ensure that lshal is available on the device.

Bug: 34712252
Change-Id: If61047afb27f9da9f8825ce18e2dfc0b3dec10e2
2017-01-26 18:17:36 +00:00
Tao Bao 69850da494 Merge "Makefile: Pack libsparse-host.so into otatools.zip." am: a85248b489 am: 3d7e6ca49c
am: f6b6de96b1

Change-Id: I45ca14927f59809c16f20267a8f697fb68a992c2
2017-01-26 16:41:19 +00:00
Tao Bao b27135b236 Makefile: Pack libsparse-host.so into otatools.zip. am: 04c8a03c85 am: 3258ac18c9
am: 0d7ffe6c5e

Change-Id: Ibffb9f9810e9ba2c24b4d0fe6fe9f5039a391bb8
2017-01-26 16:41:04 +00:00
Tao Bao f6b6de96b1 Merge "Makefile: Pack libsparse-host.so into otatools.zip." am: a85248b489
am: 3d7e6ca49c

Change-Id: I45301ccf8adb56289ffd2262f2f9aae8bc890a96
2017-01-26 16:38:17 +00:00
Tao Bao 0d7ffe6c5e Makefile: Pack libsparse-host.so into otatools.zip. am: 04c8a03c85
am: 3258ac18c9

Change-Id: Ib8e513ad7ff9de309294b79fceef3cf28ae64b56
2017-01-26 16:38:04 +00:00
Tao Bao 3d7e6ca49c Merge "Makefile: Pack libsparse-host.so into otatools.zip."
am: a85248b489

Change-Id: Ia88d643f21891df7514a5d3500e897607ef23260
2017-01-26 16:33:36 +00:00
Tao Bao 3258ac18c9 Makefile: Pack libsparse-host.so into otatools.zip.
am: 04c8a03c85

Change-Id: Ib65a7358f8626243b3eba6dd06a2c442e4f35c32
2017-01-26 16:33:35 +00:00
Tao Bao a85248b489 Merge "Makefile: Pack libsparse-host.so into otatools.zip." 2017-01-26 16:28:17 +00:00
Tao Bao 04c8a03c85 Makefile: Pack libsparse-host.so into otatools.zip.
delta_generator has a dependency on that.

Bug: 34731113
Bug: 34723547
Test: m otatools-package
Change-Id: I70752a8c283bf98cb6106d3999515d0fd01f43b2
2017-01-26 16:27:18 +00:00
Brian Carlstrom a439927293 Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59 am: a7a3e4719d
am: 52005b072d

Change-Id: I802fb68f3f1666fcecc53e2134adfeac0fa0230f
2017-01-26 08:16:09 +00:00
Brian Carlstrom 52005b072d Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59
am: a7a3e4719d

Change-Id: I880c175120c5d39abb93196c890ed0068fc2b50d
2017-01-26 08:13:10 +00:00
Brian Carlstrom a7a3e4719d Merge "Revert "Switch to clang-3625443.""
am: 4932b9fb59

Change-Id: I4b778ae7dba56cf15079dfa516ebe4fdd343e98a
2017-01-26 08:09:58 +00:00
Brian Carlstrom 4932b9fb59 Merge "Revert "Switch to clang-3625443."" 2017-01-26 08:05:36 +00:00
Stephen Hines 0425d52cde Revert "Switch to clang-3625443."
This reverts commit 296af27303.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I524c2c89004c79352bf2be3727c7ddcceca9b2e7
2017-01-26 07:59:53 +00:00
Stephen Hines 0d0d2ee04a Merge "Switch to clang-3625443." am: 296c345be9 am: 7c88a2f902
am: 2b711fb78f

Change-Id: I644f40bab1287a9f8b0a34fb3596a120cc31e61d
2017-01-26 07:30:07 +00:00
Stephen Hines 2b711fb78f Merge "Switch to clang-3625443." am: 296c345be9
am: 7c88a2f902

Change-Id: I8ad1085548ea629670d5b8e088752f2a1f953772
2017-01-26 07:25:05 +00:00
Stephen Hines 7c88a2f902 Merge "Switch to clang-3625443."
am: 296c345be9

Change-Id: I874c41aacd7e3f17f88a4f2ff54a16c6fac10042
2017-01-26 07:19:53 +00:00
Treehugger Robot 296c345be9 Merge "Switch to clang-3625443." 2017-01-26 07:13:21 +00:00
Tianjie Xu f1a13180db Remove verity blocks from care map
When reading /dev/block/dm-X, update_verifier isn't able to access the
verity meta blocks at the end of the system/vendor partition. So we need
to remove these block ranges from the care_map.

Bug: 34391662
Test: care_map generated successfully without verity meta blocks
Change-Id: Id57c602b7e5fd1b0c9d1e1fe5fcdd74e85b6b255
2017-01-25 23:01:29 -08:00
Tao Bao 85c942232d Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages.""" am: 499e53f607 am: 865aa42cae
am: 58d7d9b10a

Change-Id: I7da94902e6f7b3244d57dd48c1202cd151bef196
2017-01-25 19:01:41 +00:00
Tao Bao 58d7d9b10a Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages.""" am: 499e53f607
am: 865aa42cae

Change-Id: Ie7da9dc789f0bed594d5051869699236a5553e5b
2017-01-25 18:59:11 +00:00
Tao Bao 865aa42cae Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
am: 499e53f607

Change-Id: I1d1cece713f23ba51f6ba73e404e5cd9b4b2ef34
2017-01-25 18:56:40 +00:00
Tao Bao 499e53f607 Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages.""" 2017-01-25 18:54:23 +00:00
Jaekyun Seok c77a9a7888 Merge "Prevent abuse of property overrides" am: 7ae18449ec am: c96ffae29f
am: 5675d28df7

Change-Id: I716b89ef4b1b2fef99725b170ea5be0c09822374
2017-01-25 07:23:25 +00:00
Jaekyun Seok 5675d28df7 Merge "Prevent abuse of property overrides" am: 7ae18449ec
am: c96ffae29f

Change-Id: Ife1f31f6e33f5fdaacb5bb8acf51b9c1c8a2a098
2017-01-25 07:21:24 +00:00
Jaekyun Seok c96ffae29f Merge "Prevent abuse of property overrides"
am: 7ae18449ec

Change-Id: I035eab9562c13747d6a6917bb7be3dad81348ff6
2017-01-25 07:18:54 +00:00
Treehugger Robot 7ae18449ec Merge "Prevent abuse of property overrides" 2017-01-25 07:15:09 +00:00
Tao Bao c96316c89b Revert "Revert "releasetools: Generate streamable A/B OTA packages.""
This reverts commit ea4325baf8 to re-land
commit ef1bb4360f. It fixes the bug when
handling a package without care_map.txt (e.g. dm-verity not enabled).

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.
Test: Generate an A/B OTA package on a device with dm-verity not enabled.

Change-Id: I3469c8b62385a1fc58b4fb82e3f9d4690aef52ba
2017-01-24 22:27:02 -08:00
Jaekyun Seok 7ace0d60ef Prevent abuse of property overrides
To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.

- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
 specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
 and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
 files.

Test: building succeeded on marlin-userdebug.
Bug: 34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
(cherry picked from commit 294286d95c)
2017-01-25 13:00:25 +09:00
Tao Bao f327bff73f Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am: 5ce7034463 am: e8468634be
am: 44c7467c11

Change-Id: Ifcfd1100edbe52221a9e11a263a6990ecdf87377
2017-01-25 01:53:01 +00:00
Tao Bao 44c7467c11 Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am: 5ce7034463
am: e8468634be

Change-Id: I96d5798141d580cb6648cebe5d675c16a9c244ea
2017-01-25 01:51:01 +00:00
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 56677596ff Merge "releasetools: Generate streamable A/B OTA packages." am: 41130f495f am: 62bc5301ec
am: ac5a36e56b

Change-Id: I4589d78f4adc7ae9af3a77407cfee8a4f4b9c4e6
2017-01-25 00:02:52 +00:00
Tao Bao ac5a36e56b Merge "releasetools: Generate streamable A/B OTA packages." am: 41130f495f
am: 62bc5301ec

Change-Id: I6b70d99f0e3d944852938a4e7fdcf34dcde06e07
2017-01-25 00:00:54 +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 d1a5cf176f Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am: 131731fd49 am: 7254e730a9
am: 0e2a7399da

Change-Id: I02955c2b729673771844f3e1c3b7099e7eb50d7b
2017-01-24 22:24:23 +00:00