OSDN Git Service
Yahan Zhou [Tue, 1 Nov 2016 22:59:00 +0000 (15:59 -0700)]
Increase system image size to 2GB for the emulator
This is needed as GTS requires us to pre-install more google apps into
the system image.
Change-Id: Iaf72f745df97604c2d0bc3fbdca01730ca7be94d
Hiroshi Yamauchi [Mon, 23 Jan 2017 18:49:43 +0000 (10:49 -0800)]
Increase the generic_arm64 system image partition size to to 2G.
Bug:
34571380
Test: build sdk_google_phone_arm64.
Change-Id: I53c8980417bfac3651d71c13111a0c1dc0022d6c
Joshua Lang [Fri, 20 Jan 2017 21:33:59 +0000 (21:33 +0000)]
Merge changes from topic 'emu_audio_fixes'
* changes:
Add audio HIDL *-impl and -service libraries to product packages
Add default audio_submix module to sdk_base build
Switch video codec config xml to goldfish version
Adding goldfish_audio_legacy hal to emulator build
Switch emulator sdk build audio_conf to goldfish
TreeHugger Robot [Fri, 20 Jan 2017 02:55:25 +0000 (02:55 +0000)]
Merge "Add framework sysconfig content to the build"
Joshua Lang [Fri, 20 Jan 2017 02:49:08 +0000 (18:49 -0800)]
Add audio HIDL *-impl and -service libraries to product packages
Test: check files on the device
BUG:
34470377
Change-Id: I397bb945b92caeff4255bfaca7deb2939a98ba59
Vishwath Mohan [Fri, 20 Jan 2017 02:06:16 +0000 (02:06 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207 am:
3ca34aeb7e am:
7baefbc0d4
am:
d458faeeac
Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb
Vishwath Mohan [Fri, 20 Jan 2017 02:06:09 +0000 (02:06 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615 am:
1bd8984ace am:
085a015abb
am:
5b30c115a4
Change-Id: I1d854bb525be09926890da631ecfe77a7fb3413c
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:30:28 +0000 (01:30 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a am:
4f87826d23 am:
b7303cde95
am:
9a5562312c
Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3
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"
Christopher Tate [Fri, 13 Jan 2017 21:54:21 +0000 (13:54 -0800)]
Add framework sysconfig content to the build
Bug
30953212
Change-Id: I2f9f301a38c9d2e7214222f00a44f8ef23f36e6f
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
Joshua Lang [Wed, 2 Nov 2016 23:44:11 +0000 (16:44 -0700)]
Add default audio_submix module to sdk_base build
Bug:
32612452
Test: Build emu and check file copied
Change-Id: Iadfa4bbf56feabf1080b7b4bc1959d7152bfd1b2
Joshua Lang [Thu, 6 Oct 2016 00:43:38 +0000 (17:43 -0700)]
Switch video codec config xml to goldfish version
Need to have custom configuration for goldfish video codecs.
Bug:
31648354
Test: Build emu and check correct file copied
Change-Id: I30282bc3c4bdb0e88d98a76908bebb2939fd0d64
(cherry picked from commit
9d9cefd03e3f794d6a5aafb9ba2ec4c4d262c224)
Joshua Lang [Sat, 23 Jul 2016 01:26:56 +0000 (18:26 -0700)]
Adding goldfish_audio_legacy hal to emulator build
Test: Build emu and check file copied
Change-Id: Ib089f58d067905dc21ec32bca341b1c67046152b
(cherry picked from commit
3d65ad3e1e13a8099a78b2814e5cc1ae8ef5ace6)
(cherry picked from commit
a1675ce1ab1b58b0994a197ee2c6b81cc7bbf3dd)
Joshua Lang [Wed, 21 Sep 2016 23:26:12 +0000 (16:26 -0700)]
Switch emulator sdk build audio_conf to goldfish
Test: Build emu and check correct file copied
Change-Id: I553f8e5a024d51903e51c2ac9520d8d7b9f639af
(cherry picked from commit
c1378c053cbc111f7ac20c6aa3c0881ef84b7cba)
Colin Cross [Thu, 19 Jan 2017 06:56:22 +0000 (06:56 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa am:
d4aba70550 am:
ac15f41714
am:
239c78a5b3
Change-Id: Icbd643898cc9babb09090525aa7f0961cf9a04c9
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
Chris Tate [Thu, 19 Jan 2017 01:09:48 +0000 (01:09 +0000)]
Revert "Add framework sysconfig content to the build"
This reverts commit
d68045446f9573c28dcd578465f81bbd14b3e48d.
Change-Id: I86b3c0fbe3eaec915f7dcf92623382d77d008734
TreeHugger Robot [Thu, 19 Jan 2017 00:50:01 +0000 (00:50 +0000)]
Merge "emulator: fingerprint: switch to using fingerprint HIDL interface"
Colin Cross [Thu, 19 Jan 2017 00:48:43 +0000 (00:48 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359 am:
57de869060 am:
8b8c5d98f1
am:
054fe8dc8a
Change-Id: I7cb978ed0c7844c41793e80f581da287abccedc9
Josh Gao [Thu, 19 Jan 2017 00:41:16 +0000 (00:41 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb am:
7cf55a4581 am:
1df77bc0c7
am:
85d13bcb8e
Change-Id: Ifffa02acab8d00a6d400c78ef27e0583f36b80ea
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
TreeHugger Robot [Wed, 18 Jan 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Add framework sysconfig content to the build"
bohu [Wed, 18 Jan 2017 20:20:29 +0000 (12:20 -0800)]
emulator: fingerprint: switch to using fingerprint HIDL interface
BUG:
34387576
Change-Id: Ia203ee1540f5c7c80e17d7a17abd3ce126579551
Nimrod Gileadi [Wed, 18 Jan 2017 19:01:10 +0000 (19:01 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f am:
b3aa218921
am:
e33294ec98
Change-Id: Id917a99d3f47deb1300c5375a891a8d83d354313
Nimrod Gileadi [Wed, 18 Jan 2017 18:59:25 +0000 (18:59 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52 am:
a5b069e38b
am:
0ec86c4602
Change-Id: I3363395b812cbd1d199dc6c90fc184b1fff1cfe4
Jorim Jaggi [Wed, 18 Jan 2017 18:56:42 +0000 (18:56 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47 am:
27b7101c6c am:
4f34f3d6f0
am:
89abe45160
Change-Id: Iedf9db6623a5214baa59e1be9ef5d7dfe6591db5
Jorim Jaggi [Wed, 18 Jan 2017 18:56:27 +0000 (18:56 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748 am:
b909e2c1aa am:
82968395c1
am:
a82a67145f
Change-Id: I735361d5facbe6a5cf1ffe4a61d5aecfa7b4f3db
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:06:58 +0000 (17:06 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f am:
d70bbef6bc
am:
ed2000f147
Change-Id: Ibf4773a1689852ae83a66f20737b6f30c6389e31
Nimrod Gileadi [Wed, 18 Jan 2017 17:06:24 +0000 (17:06 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52 am:
edfdd39433
am:
ab0fd43472
Change-Id: I860f993f1d82bb98ce921cc4749f93c098596bc7
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
Jorim Jaggi [Wed, 18 Jan 2017 15:28:54 +0000 (16:28 +0100)]
Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit
c5ffdd4bb44bae3ad67ecea745f79b0a05015708.
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:29:25 +0000 (06:29 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625 am:
cb0a92be8b am:
e3ce754d96
am:
2e0e89a0f5
Change-Id: If7a7c4351e8cb6e395b02790222892578e4f833c
Sandeep Patil [Wed, 18 Jan 2017 06:27:05 +0000 (06:27 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4 am:
a94ae916ce am:
eec071a34a
am:
8a3f41af27
Change-Id: I7d859256d4e0b3fed0a58932d5ddc9498a69c1eb
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:55:15 +0000 (00:55 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65 am:
bbf5e0b99b am:
fbd4ec4d59
am:
7500744864
Change-Id: I0ebb64a50104b13c20af77b3126b3c6e10c5f65f
Sandeep Patil [Wed, 18 Jan 2017 00:55:09 +0000 (00:55 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63 am:
0068df10f6 am:
29c9cb811d
am:
d091ce20b1
Change-Id: I3331c1b48a75374f675d8527255d3d28ed3251bd
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."
Adam Seaton [Tue, 17 Jan 2017 23:46:08 +0000 (23:46 +0000)]
Merge changes from topic 'am-
8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
am:
9f58ec2f1c
Change-Id: I3284def1320104dd8c38f0a23f43112f576a2518
Adam Seaton [Tue, 17 Jan 2017 23:46:06 +0000 (23:46 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4 am:
5c2bd9cb75 -s ours am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240 am:
ac3e93e3b4
am:
f42172ccc7 -s ours
Change-Id: I4ddbfe3915089f8356255c15135b90366c4f43d0
Adam Seaton [Tue, 17 Jan 2017 23:45:52 +0000 (23:45 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439 am:
1e907b8fe6 am:
e61f600b82 am:
1d806358f5 -s ours am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7 am:
e6906d8961
am:
15016225c6 -s ours
Change-Id: I1e6d047023c771aa49f4bce2857e9459d0739e80
Adam Seaton [Tue, 17 Jan 2017 23:45:23 +0000 (23:45 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4 am:
5c2bd9cb75 -s ours am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240 am:
d672d69641
am:
dcd75eb9c6 -s ours
Change-Id: I7d82e9c054fc124e46e0338cea2e64e53de6578c
Adam Seaton [Tue, 17 Jan 2017 23:45:13 +0000 (23:45 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439 am:
1e907b8fe6 am:
e61f600b82 am:
1d806358f5 -s ours am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7 am:
e69a8f1710
am:
925e40dcaa -s ours
Change-Id: I79ff7f4a6ff5e71a2ab1f41880d1d113600a0cc2
Android Build Merger (Role) [Tue, 17 Jan 2017 23:43:08 +0000 (23:43 +0000)]
Merge changes from topic 'am-
8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
* changes:
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4 am:
5c2bd9cb75 -s ours am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240 am:
ac3e93e3b4
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439 am:
1e907b8fe6 am:
e61f600b82 am:
1d806358f5 -s ours am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7 am:
e6906d8961
Adam Seaton [Tue, 17 Jan 2017 23:42:52 +0000 (23:42 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4 am:
5c2bd9cb75 -s ours am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240
am:
ac3e93e3b4
Change-Id: Ic6433947c1764ca54ccbd3967ced14788012ae23
Adam Seaton [Tue, 17 Jan 2017 23:42:52 +0000 (23:42 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4 am:
5c2bd9cb75 -s ours am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240
am:
d672d69641
Change-Id: Ib8221434812089d823781435e17b64413c4b0f19
OSDN Git Service
