OSDN Git Service
Tao Bao [Wed, 25 Jan 2017 19:01:41 +0000 (19:01 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages.""" am:
499e53f607 am:
865aa42cae
am:
58d7d9b10a
Change-Id: I7da94902e6f7b3244d57dd48c1202cd151bef196
Tao Bao [Wed, 25 Jan 2017 18:59:11 +0000 (18:59 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages.""" am:
499e53f607
am:
865aa42cae
Change-Id: Ie7da9dc789f0bed594d5051869699236a5553e5b
Tao Bao [Wed, 25 Jan 2017 18:56:40 +0000 (18:56 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
am:
499e53f607
Change-Id: I1d1cece713f23ba51f6ba73e404e5cd9b4b2ef34
Tao Bao [Wed, 25 Jan 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
Jaekyun Seok [Wed, 25 Jan 2017 07:23:25 +0000 (07:23 +0000)]
Merge "Prevent abuse of property overrides" am:
7ae18449ec am:
c96ffae29f
am:
5675d28df7
Change-Id: I716b89ef4b1b2fef99725b170ea5be0c09822374
Jaekyun Seok [Wed, 25 Jan 2017 07:21:24 +0000 (07:21 +0000)]
Merge "Prevent abuse of property overrides" am:
7ae18449ec
am:
c96ffae29f
Change-Id: Ife1f31f6e33f5fdaacb5bb8acf51b9c1c8a2a098
Jaekyun Seok [Wed, 25 Jan 2017 07:18:54 +0000 (07:18 +0000)]
Merge "Prevent abuse of property overrides"
am:
7ae18449ec
Change-Id: I035eab9562c13747d6a6917bb7be3dad81348ff6
Treehugger Robot [Wed, 25 Jan 2017 07:15:07 +0000 (07:15 +0000)]
Merge "Prevent abuse of property overrides"
Tao Bao [Wed, 25 Jan 2017 06:10:49 +0000 (22:10 -0800)]
Revert "Revert "releasetools: Generate streamable A/B OTA packages.""
This reverts commit
ea4325baf8a673e869cac8981781cf57c4821cb5 to re-land
commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36. 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
Jaekyun Seok [Fri, 20 Jan 2017 04:17:12 +0000 (13:17 +0900)]
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
294286d95c7647c1c20c3537f065c21e85371695)
Tao Bao [Wed, 25 Jan 2017 01:53:01 +0000 (01:53 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am:
5ce7034463 am:
e8468634be
am:
44c7467c11
Change-Id: Ifcfd1100edbe52221a9e11a263a6990ecdf87377
Tao Bao [Wed, 25 Jan 2017 01:51:01 +0000 (01:51 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am:
5ce7034463
am:
e8468634be
Change-Id: I96d5798141d580cb6648cebe5d675c16a9c244ea
Tao Bao [Wed, 25 Jan 2017 01:49:00 +0000 (01:49 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
am:
5ce7034463
Change-Id: If2a3ee497124b87d1ff3c6bb10a05065c856bd96
Tao Bao [Wed, 25 Jan 2017 01:45:44 +0000 (01:45 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
Tao Bao [Wed, 25 Jan 2017 01:41:13 +0000 (01:41 +0000)]
Revert "releasetools: Generate streamable A/B OTA packages."
This reverts commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36.
It has broken the builds that don't have care_map.txt entry.
Change-Id: I343455e66be5e79457968dfc2813c7c1c234b6dc
Tao Bao [Wed, 25 Jan 2017 00:02:52 +0000 (00:02 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages." am:
41130f495f am:
62bc5301ec
am:
ac5a36e56b
Change-Id: I4589d78f4adc7ae9af3a77407cfee8a4f4b9c4e6
Tao Bao [Wed, 25 Jan 2017 00:00:54 +0000 (00:00 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages." am:
41130f495f
am:
62bc5301ec
Change-Id: I6b70d99f0e3d944852938a4e7fdcf34dcde06e07
Tao Bao [Tue, 24 Jan 2017 23:59:24 +0000 (23:59 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
am:
41130f495f
Change-Id: I33e4eb9cc536c7d49535a4c393a6b3303add9742
Tao Bao [Tue, 24 Jan 2017 23:55:52 +0000 (23:55 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am:
131731fd49 am:
7254e730a9
am:
0e2a7399da
Change-Id: I02955c2b729673771844f3e1c3b7099e7eb50d7b
Calin Juravle [Tue, 24 Jan 2017 22:23:32 +0000 (22:23 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am:
eddf3adec7 am:
9be4363048
am:
79ff8975b6
Change-Id: I18428fe7cfb49a70dcf55b77dd0d92d839acdf01
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:22:08 +0000 (22:22 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am:
131731fd49
am:
7254e730a9
Change-Id: If496e17ca32097e2b5c5d1b16097ba68f52c2587
Calin Juravle [Tue, 24 Jan 2017 22:21:28 +0000 (22:21 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am:
eddf3adec7
am:
9be4363048
Change-Id: I09bb657dfa3a3d5ca5a2410313ee061235f56c74
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:20:19 +0000 (22:20 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
am:
131731fd49
Change-Id: I434953132243db254adf8513240e33257b917b21
Calin Juravle [Tue, 24 Jan 2017 22:19:32 +0000 (22:19 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
am:
eddf3adec7
Change-Id: I3405653797259f6529e1fd4e10434a435a3365fd
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:14:43 +0000 (22:14 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
Calin Juravle [Tue, 24 Jan 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
Evgenii Stepanov [Tue, 24 Jan 2017 20:58:55 +0000 (20:58 +0000)]
Merge "Force Thumb for CFI targets." am:
34eb9f7f60 am:
9e8e3de9d8
am:
682a87a7f5
Change-Id: I9a586f57a8988bdb8d772705acef8f5f8b967e8d
Evgenii Stepanov [Tue, 24 Jan 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am:
96c81711c1 am:
e729e804fe
am:
629002835a
Change-Id: Ia09b6fa057b4aada743d82ffcf5af87ab1b149f9
Evgenii Stepanov [Tue, 24 Jan 2017 20:56:54 +0000 (20:56 +0000)]
Merge "Force Thumb for CFI targets." am:
34eb9f7f60
am:
9e8e3de9d8
Change-Id: I4f997927ff4357799afe8ca5d78255ea4e563beb
Evgenii Stepanov [Tue, 24 Jan 2017 20:56:41 +0000 (20:56 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am:
96c81711c1
am:
e729e804fe
Change-Id: I8a20ce05dffbf33b7c3480e13ee40cf0257dc06a
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Force Thumb for CFI targets."
am:
34eb9f7f60
Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:42 +0000 (20:54 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
am:
96c81711c1
Change-Id: I914f2c1e037ad8988181801f7689636952beb5b2
Evgenii Stepanov [Tue, 24 Jan 2017 20:52:25 +0000 (20:52 +0000)]
Merge "Force Thumb for CFI targets."
Evgenii Stepanov [Tue, 24 Jan 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
Hiroshi Yamauchi [Tue, 24 Jan 2017 19:08:44 +0000 (11:08 -0800)]
Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug:
34084559
Bug:
34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
Evgenii Stepanov [Tue, 24 Jan 2017 00:57:38 +0000 (16:57 -0800)]
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
Evgenii Stepanov [Fri, 20 Jan 2017 22:12:08 +0000 (14:12 -0800)]
Force Thumb for CFI targets.
Bug:
22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
Tao Bao [Wed, 11 Jan 2017 19:57:10 +0000 (11:57 -0800)]
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
Vishwath Mohan [Fri, 20 Jan 2017 01:56:14 +0000 (01:56 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207 am:
3ca34aeb7e
am:
7baefbc0d4
Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2
Vishwath Mohan [Fri, 20 Jan 2017 01:56:08 +0000 (01:56 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615 am:
1bd8984ace
am:
085a015abb
Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6
Vishwath Mohan [Fri, 20 Jan 2017 01:50:44 +0000 (01:50 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207
am:
3ca34aeb7e
Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f
Vishwath Mohan [Fri, 20 Jan 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615
am:
1bd8984ace
Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad
Vishwath Mohan [Fri, 20 Jan 2017 01:45:43 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
2d7fb30207
Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
Vishwath Mohan [Fri, 20 Jan 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
c0bf85a615
Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Dan Willemsen [Fri, 20 Jan 2017 01:20:08 +0000 (01:20 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a am:
4f87826d23
am:
b7303cde95
Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
Dan Willemsen [Fri, 20 Jan 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a
am:
4f87826d23
Change-Id: I918859e58ab5d753e8a9cc83fc8f2eab940acbb9
Dan Willemsen [Fri, 20 Jan 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
am:
bf28f5933a
Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
Treehugger Robot [Fri, 20 Jan 2017 00:59:41 +0000 (00:59 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
Vishwath Mohan [Thu, 19 Jan 2017 22:35:31 +0000 (14:35 -0800)]
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
Colin Cross [Thu, 19 Jan 2017 06:53:52 +0000 (06:53 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa am:
d4aba70550
am:
ac15f41714
Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05
Colin Cross [Thu, 19 Jan 2017 06:51:21 +0000 (06:51 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa
am:
d4aba70550
Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0
Colin Cross [Thu, 19 Jan 2017 06:48:21 +0000 (06:48 +0000)]
Merge "Don't pass empty arguments to ninja"
am:
f8acdc50fa
Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
Treehugger Robot [Thu, 19 Jan 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Don't pass empty arguments to ninja"
Colin Cross [Thu, 19 Jan 2017 05:12:28 +0000 (21:12 -0800)]
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
Vishwath Mohan [Thu, 19 Jan 2017 01:50:29 +0000 (17:50 -0800)]
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
Colin Cross [Thu, 19 Jan 2017 00:15:57 +0000 (00:15 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359 am:
57de869060
am:
8b8c5d98f1
Change-Id: I94f427a5830c5400c0ad96b73b59210ebb845d7b
Colin Cross [Thu, 19 Jan 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359
am:
57de869060
Change-Id: I7c115293cc3dc86b7354b60ddf23b1bf5181ed6e
Colin Cross [Thu, 19 Jan 2017 00:12:27 +0000 (00:12 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
am:
bb5c13d359
Change-Id: Id3c6a55e0d6feb91d928a01ffd0875b574a8e5fb
Treehugger Robot [Thu, 19 Jan 2017 00:08:39 +0000 (00:08 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
Josh Gao [Wed, 18 Jan 2017 23:55:26 +0000 (23:55 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb am:
7cf55a4581
am:
1df77bc0c7
Change-Id: I298e81531aa44a488ba1ff1e73148de83830fd9a
Josh Gao [Wed, 18 Jan 2017 23:42:40 +0000 (23:42 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb
am:
7cf55a4581
Change-Id: Icf8f7ec6d0a9a74fdad5c7b49c88a5ef71dedd3c
Josh Gao [Wed, 18 Jan 2017 23:16:55 +0000 (23:16 +0000)]
Merge "Add crash_dump and tombstoned products."
am:
6651199eeb
Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge "Add crash_dump and tombstoned products."
Colin Cross [Wed, 18 Jan 2017 22:38:20 +0000 (14:38 -0800)]
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
Nimrod Gileadi [Wed, 18 Jan 2017 18:22:53 +0000 (18:22 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f
am:
b3aa218921
Change-Id: I7a3065d225439958f0454e0a0e2c761a2c5262ab
Nimrod Gileadi [Wed, 18 Jan 2017 18:21:07 +0000 (18:21 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52
am:
a5b069e38b
Change-Id: I2b65b68e4e6aa8705fe0782becb2c26bc2da36d1
Jorim Jaggi [Wed, 18 Jan 2017 18:18:56 +0000 (18:18 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47 am:
27b7101c6c
am:
4f34f3d6f0
Change-Id: Ied71fc8b2771ba2383723f83554abb8153c1d9ec
Jorim Jaggi [Wed, 18 Jan 2017 18:18:46 +0000 (18:18 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748 am:
b909e2c1aa
am:
82968395c1
Change-Id: I5b5d6bd944b4aed152aebaed7e3758cbcbfb0411
Nimrod Gileadi [Wed, 18 Jan 2017 17:00:24 +0000 (17:00 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f
am:
d70bbef6bc
Change-Id: Ie9bba383ca175ee50b393918f09c12203f5219c5
Nimrod Gileadi [Wed, 18 Jan 2017 16:59:52 +0000 (16:59 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52
am:
edfdd39433
Change-Id: I140c793c21fa7ec9b9422c94558aa842e013bb22
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:54 +0000 (16:53 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
am:
11111d875f
Change-Id: I111591054d3131d5a0b0c0011d8b5940b74ce932
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:53 +0000 (16:53 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
am:
11111d875f
Change-Id: I08546a16803fa27c99a39c15ef8cb1b12aa63249
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:23 +0000 (16:53 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
am:
8570bcea52
Change-Id: If6276de7e9eb16b4b627bc3c76599937a5100198
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:23 +0000 (16:53 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
am:
8570bcea52
Change-Id: I2a699ee186c08b60f2f5f98a00a0a5cc3230944c
Jorim Jaggi [Wed, 18 Jan 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47
am:
27b7101c6c
Change-Id: Idce14b6caac043b5c2880c1d46365ad0610f48a3
Jorim Jaggi [Wed, 18 Jan 2017 16:47:43 +0000 (16:47 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748
am:
b909e2c1aa
Change-Id: I4549c025a473768a504a908acf388abc0266f616
Nimrod Gileadi [Wed, 18 Jan 2017 16:44:35 +0000 (16:44 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
Jorim Jaggi [Wed, 18 Jan 2017 16:42:00 +0000 (16:42 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am:
ce0bae2f47
Change-Id: I230c5966278be38339fd369075be30320d27bcd2
Jorim Jaggi [Wed, 18 Jan 2017 16:41:33 +0000 (16:41 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."
am:
8cbd925748
Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496
Jorim Jaggi [Wed, 18 Jan 2017 16:33:31 +0000 (16:33 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
Jorim Jaggi [Wed, 18 Jan 2017 15:37:30 +0000 (15:37 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit
c5ffdd4bb44bae3ad67ecea745f79b0a05015708.
Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
Nimrod Gileadi [Tue, 17 Jan 2017 20:07:56 +0000 (20:07 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420.
Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.
Bug:
33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d
Sandeep Patil [Wed, 18 Jan 2017 06:24:38 +0000 (06:24 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625 am:
cb0a92be8b
am:
e3ce754d96
Change-Id: I3cec1cfe55262b018a12559e94dbb1c0c6492a01
Sandeep Patil [Wed, 18 Jan 2017 06:22:01 +0000 (06:22 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4 am:
a94ae916ce
am:
eec071a34a
Change-Id: I675d59aabc9c6aab96e986413ebc03d5cf80eead
Sandeep Patil [Wed, 18 Jan 2017 06:19:13 +0000 (06:19 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625
am:
cb0a92be8b
Change-Id: Icf60fccc8999b98dbf07cd52a4d34ce2b118dab8
Sandeep Patil [Wed, 18 Jan 2017 06:17:24 +0000 (06:17 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
am:
f91d163625
Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
Sandeep Patil [Wed, 18 Jan 2017 06:16:59 +0000 (06:16 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4
am:
a94ae916ce
Change-Id: I91f8f35dbf12f97ba81d7d45951323eccf298cf2
Sandeep Patil [Wed, 18 Jan 2017 06:12:26 +0000 (06:12 +0000)]
SELinux: split property_contexts into platform and non-platform components.
am:
c5ffdd4bb4
Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
Treehugger Robot [Wed, 18 Jan 2017 06:09:02 +0000 (06:09 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
Sandeep Patil [Wed, 18 Jan 2017 00:50:46 +0000 (00:50 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65 am:
bbf5e0b99b
am:
fbd4ec4d59
Change-Id: I236a97bff0f22db1499fdedbdb533d6159d8b28f
Sandeep Patil [Wed, 18 Jan 2017 00:50:36 +0000 (00:50 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63 am:
0068df10f6
am:
29c9cb811d
Change-Id: Ia50fec868a07669ab9e20c212684892e248ff24b
Sandeep Patil [Wed, 18 Jan 2017 00:46:12 +0000 (00:46 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65
am:
bbf5e0b99b
Change-Id: I080b0b58e8c86a444f43fa65c7a92187e9a4fd5f
Sandeep Patil [Wed, 18 Jan 2017 00:46:05 +0000 (00:46 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63
am:
0068df10f6
Change-Id: I0c049562c6afb08c2fc3bb033be874e483d68ddb
Sandeep Patil [Wed, 18 Jan 2017 00:41:38 +0000 (00:41 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
am:
a91d63fa65
Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
Sandeep Patil [Tue, 27 Dec 2016 23:47:06 +0000 (15:47 -0800)]
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>
Sandeep Patil [Wed, 18 Jan 2017 00:41:03 +0000 (00:41 +0000)]
SELinux: split service_contexts into platform and non-platform components.
am:
e4ade08f63
Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
OSDN Git Service
