Brian Carlstrom
3ce15fcc91
am de1dadb7
: Merge "Disable darwin build"
...
* commit 'de1dadb73903a3b8d080ed6d2b5e916fe9654fc4':
Disable darwin build
2013-05-15 10:41:45 -07:00
Brian Carlstrom
de1dadb739
Merge "Disable darwin build"
2013-05-15 16:33:45 +00:00
Brian Carlstrom
b0df2f1525
Disable darwin build
...
Change-Id: Ie72bbaab8604cdc14082859b735458a2f73c3074
2013-05-15 09:13:04 -07:00
The Android Automerger
4a21072095
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-15 05:55:51 -07:00
gcondra@google.com
e45710f19f
am 5a98566d
: am 921be8b6
: Add a version check for SELinux policy on device.
...
* commit '5a98566d589408c78e35f4476f478a2fa1c13e78':
Add a version check for SELinux policy on device.
2013-05-14 23:45:59 -07:00
gcondra@google.com
5a98566d58
am 921be8b6
: Add a version check for SELinux policy on device.
...
* commit '921be8b6568df0057c4eacbac2e1022b71e09620':
Add a version check for SELinux policy on device.
2013-05-14 23:43:56 -07:00
Brian Carlstrom
9186d85021
am a817ff9c
: resolved conflicts for merge of 07db2970
to jb-mr2-dev-plus-aosp
...
* commit 'a817ff9cf61daeb69e8b8382c80677e3e5c573a9':
Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
Add basic Darwin support to libcorkscrew.
2013-05-14 22:04:15 -07:00
Brian Carlstrom
a817ff9cf6
resolved conflicts for merge of 07db2970
to jb-mr2-dev-plus-aosp
...
Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
2013-05-14 21:59:53 -07:00
Brian Carlstrom
07db297045
Merge changes I5578fe06,I197b06c4
...
* changes:
Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
Add basic Darwin support to libcorkscrew.
2013-05-15 04:30:58 +00:00
repo sync
921be8b656
Add a version check for SELinux policy on device.
...
This helps to ensure that when a new system image is installed,
old userdata policy isn't applied over the top of it.
Bug: 8841348
Change-Id: I135af32250aa62979763e775842ce0af3c8b6f9f
2013-05-14 21:05:03 -07:00
Elliott Hughes
89054056a7
Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
...
(If you fclose(3) rather than pclose(3) a FILE* you got from popen(3),
future popen(3)s fail obscurely, at least on Mac OS.)
(cherry picked from commit 2bf76e143da933184d1392fb9bea3a3896c37e76)
Change-Id: I5578fe06753061b0dbc5ee951ebf31eb2bab0389
2013-05-14 19:49:30 -07:00
Elliott Hughes
bfec3a3150
Add basic Darwin support to libcorkscrew.
...
This might not seem like much, but it's already better than Mac OS'
backtrace(3).
(cherry picked from commit 2a46f6293f19b9d6100187fbd53088088e671b88)
Change-Id: I197b06c4c19f728ad6f194b2f473bd9dcd99b8a6
2013-05-14 19:49:22 -07:00
Mathias Agopian
8577e86490
surfaceflinger is now always running in its own process
...
Change-Id: I1ae63347a8b6d406306ed894665674dd726b7d51
2013-05-09 14:57:06 -07:00
gcondra@google.com
2fd3cc4c0f
am ac5cf925
: am 683aa89b
: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
...
* commit 'ac5cf925f86706d2bf89948e7cd3379376185d3b':
Remove /system from the dirs to relabel.
2013-05-08 15:04:02 -07:00
Jamie Gennis
a0e780edd3
am 6e46a3b8
: am a1ee12ca
: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
...
* commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b':
libcutils: add a trace tag for Dalvik
2013-05-08 15:03:54 -07:00
The Android Automerger
a64b3f001f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-08 05:55:54 -07:00
Dima Zavin
1a8bb3e815
Merge "cutils: first pass at cleaning up legacy/obsolete code in cutils"
2013-05-08 07:36:36 +00:00
gcondra@google.com
ac5cf925f8
am 683aa89b
: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
...
* commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98':
Remove /system from the dirs to relabel.
2013-05-07 19:19:50 -07:00
repo sync
683aa89bfd
Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
2013-05-08 02:18:20 +00:00
repo sync
3d4d07b2fa
Remove /system from the dirs to relabel.
...
Bug: 8841348
Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
2013-05-07 19:05:08 -07:00
Jamie Gennis
6e46a3b8e6
am a1ee12ca
: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
...
* commit 'a1ee12ca3a0ec44bb8a3eb917d13c0b5178075d9':
libcutils: add a trace tag for Dalvik
2013-05-07 18:16:28 -07:00
Jamie Gennis
a1ee12ca3a
Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
2013-05-08 01:12:19 +00:00
Jamie Gennis
2b68e0675b
libcutils: add a trace tag for Dalvik
...
This change adds a trace tag bit for Dalvik. It also allows the ATRACE_*
macros to be called from code compiled for the host with no effect.
Bug: 8856374
Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
2013-05-07 15:19:34 -07:00
Dima Zavin
e00a12bf8a
cutils: first pass at cleaning up legacy/obsolete code in cutils
...
Removed unused code and moved libraries with single clients
near their respective users.
Change-Id: I65f90f8659f27bd0f44ca5ddf33da2bce14674c1
Signed-off-by: Dima Zavin <dima@android.com>
2013-05-07 00:19:44 -07:00
Ying Wang
8da4fa3504
am 6119cffa
: am 7382459e
: Merge "Host builds: add fastboot and adb"
...
* commit '6119cffa63d1b5d49c23a25353fc40ad0d99f82e':
Host builds: add fastboot and adb
2013-05-02 10:56:09 -07:00
Ying Wang
6119cffa63
am 7382459e
: Merge "Host builds: add fastboot and adb"
...
* commit '7382459eca9632168b9d393bc77fb62bc21bb67a':
Host builds: add fastboot and adb
2013-05-02 10:53:18 -07:00
Ying Wang
7382459eca
Merge "Host builds: add fastboot and adb"
2013-05-02 16:52:45 +00:00
Kenny Root
928116ceef
Host builds: add fastboot and adb
...
Add fastboot and adb host utilities to debug builds for debugging
and development purposes.
Change-Id: If77699a27497b8641998930f14d4ee418b856080
2013-05-02 09:51:53 -07:00
The Android Automerger
2f8b6a036b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:56:12 -07:00
Colin Cross
69e9b17fa1
am cb4b9605
: am 8794b2ee
: Merge "Fix perms on /data/security"
...
* commit 'cb4b9605cb923d071a546b444d10cbe21367d878':
Fix perms on /data/security
2013-04-30 21:13:47 -07:00
Colin Cross
72b1ffd375
am 803eda6a
: am f69cc564
: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit '803eda6a2dfcb50f61dd4a6a616e560a87453cb0':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:13:47 -07:00
Colin Cross
51ef5882e7
am 55d69a96
: am 032be7a4
: Merge "Log an error if property pool is exhausted"
...
* commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b':
Log an error if property pool is exhausted
2013-04-30 21:13:46 -07:00
Colin Cross
cb4b9605cb
am 8794b2ee
: Merge "Fix perms on /data/security"
...
* commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc':
Fix perms on /data/security
2013-04-30 21:12:29 -07:00
Colin Cross
803eda6a2d
am f69cc564
: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit 'f69cc564f4129ad7f223bb7d83ebec9fe3438b62':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:12:28 -07:00
Colin Cross
55d69a9681
am 032be7a4
: Merge "Log an error if property pool is exhausted"
...
* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
Log an error if property pool is exhausted
2013-04-30 21:12:28 -07:00
Colin Cross
8794b2eeb2
Merge "Fix perms on /data/security"
2013-05-01 03:49:47 +00:00
Colin Cross
f69cc564f4
Merge "Update ueventd set the SELinux context on sysfs"
2013-05-01 03:48:41 +00:00
Colin Cross
032be7a4c5
Merge "Log an error if property pool is exhausted"
2013-05-01 03:47:19 +00:00
gcondra@google.com
efbe7fc6cc
am 63577d92
: am fee250d2
: Reload policy after setting up the data partition.
...
* commit '63577d9280e7919bfb7221030d211b833e66bb1e':
Reload policy after setting up the data partition.
2013-04-30 17:18:05 -07:00
gcondra@google.com
63577d9280
am fee250d2
: Reload policy after setting up the data partition.
...
* commit 'fee250d27a9c03af1ba439047b976d89563b1887':
Reload policy after setting up the data partition.
2013-04-30 17:04:53 -07:00
repo sync
fee250d27a
Reload policy after setting up the data partition.
...
This forces a policy reload + fixcon to deal with dynamically
delivered policy changing labels on device nodes.
It's implemented as a new keyword in init.
Bug: 8702843
Change-Id: I803cf1ecf6ff8318ce25dcc5cda4f292adc9738c
2013-04-30 11:40:22 -07:00
Kenny Root
152a432151
am d14586e3
: resolved conflicts for merge of a69af5af
to jb-mr2-dev-plus-aosp
...
* commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7':
Track change to JSSE provider
2013-04-30 09:01:42 -07:00
Kenny Root
d14586e35a
resolved conflicts for merge of a69af5af
to jb-mr2-dev-plus-aosp
...
Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
2013-04-29 23:20:37 -07:00
Kenny Root
a69af5af3d
Merge "Track change to JSSE provider"
2013-04-30 04:01:39 +00:00
Kenny Root
ca0404b83e
Track change to JSSE provider
...
Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
2013-04-29 14:20:43 -07:00
The Android Automerger
97de3e8c46
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:56:19 -07:00
Johan Redestig
fd7ffb1089
Log an error if property pool is exhausted
...
Failing to set properties due to an exhausted pool leads
to difficult to debug problems. This change adds an
error log to make the situation a bit easier to handle.
Change-Id: Icc1d97a80882fb23e74428a0195f1d28dba68fa8
2013-04-29 13:07:40 +02:00
gcondra@google.com
ada3291c8d
am 14ad7861
: am 538b5d4e
: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '14ad786183455ad9c8298e24946d4da0f24458d7':
Add persistent property for SELinux enforcment status.
2013-04-26 13:39:40 -07:00
gcondra@google.com
14ad786183
am 538b5d4e
: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '538b5d4e8e4c480b2120aa957fe3e11a2836a1b3':
Add persistent property for SELinux enforcment status.
2013-04-26 13:37:52 -07:00
repo sync
538b5d4e8e
Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
2013-04-26 20:31:21 +00:00