Mark Salyzyn
852bb213c3
am 8c9f052a: am a791ec8a: Merge "Revert "libcutils: fs_config read from file""
...
* commit '8c9f052a77a21c7d771277e88edb0bd64eae9890':
Revert "libcutils: fs_config read from file"
2015-04-15 22:49:59 +00:00
Mark Salyzyn
8c9f052a77
am a791ec8a: Merge "Revert "libcutils: fs_config read from file""
...
* commit 'a791ec8ad15630978ce072f619c47515b3fd70ac':
Revert "libcutils: fs_config read from file"
2015-04-15 22:43:06 +00:00
Mark Salyzyn
a791ec8ad1
Merge "Revert "libcutils: fs_config read from file""
2015-04-15 22:31:26 +00:00
Mark Salyzyn
7e82633106
Revert "libcutils: fs_config read from file"
...
There is no endian.h on windows
This reverts commit 4e5f71ae72 .
Change-Id: I6aedf35ed319c7f8febc7ab98e104a625fb27f69
2015-04-15 22:30:30 +00:00
Mark Salyzyn
440dffa252
am 6a6844c7: am 89e2f942: Merge "libcutils: fs_config read from file"
...
* commit '6a6844c7b518a40985a3c13d2c986589b5ff4fd2':
libcutils: fs_config read from file
2015-04-15 21:25:57 +00:00
Mark Salyzyn
6a6844c7b5
am 89e2f942: Merge "libcutils: fs_config read from file"
...
* commit '89e2f942181feab45e7dab5b6d3183da0475a295':
libcutils: fs_config read from file
2015-04-15 21:19:47 +00:00
Mark Salyzyn
89e2f94218
Merge "libcutils: fs_config read from file"
2015-04-15 21:09:26 +00:00
Dan Stoza
a197c3b74b
am 3ec9c17f: am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit '3ec9c17fb6e232ddc78521fdd305e0897230ac1d':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:12:17 +00:00
Dan Stoza
3ec9c17fb6
am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit '04274a29ff534000ca38cdb627daab98cfa2878d':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:01:03 +00:00
Dan Stoza
04274a29ff
Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
2015-04-15 19:55:13 +00:00
Dan Stoza
238ec985f9
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
...
Adds a new perform action: NATIVE_SET_WINDOW_SURFACE_DAMAGE, which
allows the producer to describe the region of the surface that has
changed since the previous frame.
Bug: 11239309
Change-Id: Ie645e6a52b37b5c1b3be19481e8348570d1aa62c
2015-04-15 12:49:41 -07:00
Mark Salyzyn
ce70d556e0
am 961b215c: am c01445d2: Merge "makebootfs: use libcutils shared libraries"
...
* commit '961b215c41576424cdc8cfe0d5aa5e1db90c226c':
makebootfs: use libcutils shared libraries
2015-04-15 18:37:11 +00:00
Mark Salyzyn
4e5f71ae72
libcutils: fs_config read from file
...
Intention is to read from ${OUT}/system/etc/fs_config_dirs and
${OUT}/system/etc/fs_config_files on host. And
/system/etc/fs_config_dirs and /system/etc/config_files
on target systems.
Bug: 19908228
Change-Id: I0966a94f79a3fae4f7325056c701ea355370f9df
2015-04-15 11:22:52 -07:00
Mark Salyzyn
961b215c41
am c01445d2: Merge "makebootfs: use libcutils shared libraries"
...
* commit 'c01445d2e8faafdb40e4fb426bc537f4f1220bad':
makebootfs: use libcutils shared libraries
2015-04-15 18:22:38 +00:00
Elliott Hughes
6e9b28b2ea
am fae77740: am f65d9756: Merge "Move away from gr_surface."
...
* commit 'fae77740c29b732e82b73a043f596470cd0ac0ed':
Move away from gr_surface.
2015-04-15 18:22:25 +00:00
Mark Salyzyn
c01445d2e8
Merge "makebootfs: use libcutils shared libraries"
2015-04-15 18:14:19 +00:00
Elliott Hughes
fae77740c2
am f65d9756: Merge "Move away from gr_surface."
...
* commit 'f65d97567c0d857458a1978085af4518750f51b6':
Move away from gr_surface.
2015-04-15 18:10:08 +00:00
Elliott Hughes
f65d97567c
Merge "Move away from gr_surface."
2015-04-15 18:02:06 +00:00
Mark Salyzyn
bc7828eb42
makebootfs: use libcutils shared libraries
...
- move to libcutils.so as shared now that they are
in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I915503f64389b59075620578601f98fc0756bd7a
2015-04-15 10:32:19 -07:00
Elliott Hughes
9e85ea1403
Move away from gr_surface.
...
Change-Id: Icfa81b18e5c99e3ffc5c55aba1d435eb26eb8680
2015-04-15 10:25:55 -07:00
Mark Salyzyn
687dae83da
am 437a328a: am 56c6575d: Merge "logd: syscall optimization"
...
* commit '437a328a14ee07b8da434964eb13f640302c0302':
logd: syscall optimization
2015-04-15 15:05:56 +00:00
Mark Salyzyn
437a328a14
am 56c6575d: Merge "logd: syscall optimization"
...
* commit '56c6575da72653c3ffd79baf1b431574d6f7e1ea':
logd: syscall optimization
2015-04-15 14:55:49 +00:00
Mark Salyzyn
56c6575da7
Merge "logd: syscall optimization"
2015-04-15 14:45:24 +00:00
Yabin Cui
5966e7e5f4
am 03e590a7: am 7369d314: Merge "Fix alignment when reading note segment."
...
* commit '03e590a7285111b2f8ef25dac74e50a543ed8010':
Fix alignment when reading note segment.
2015-04-14 21:02:02 +00:00
Yabin Cui
03e590a728
am 7369d314: Merge "Fix alignment when reading note segment."
...
* commit '7369d314d255afc1df5f7cf343785cc942042852':
Fix alignment when reading note segment.
2015-04-14 20:42:37 +00:00
Mark Salyzyn
d65b1281f4
am 9c328e67: am 35d09b69: Merge "logd: pidToUid incorrect"
...
* commit '9c328e67c0eb64f7d73dd5b537950c02b62bd77c':
logd: pidToUid incorrect
2015-04-14 20:34:29 +00:00
Yabin Cui
7369d314d2
Merge "Fix alignment when reading note segment."
2015-04-14 20:34:27 +00:00
Mark Salyzyn
9c328e67c0
am 35d09b69: Merge "logd: pidToUid incorrect"
...
* commit '35d09b6928d77d619d95d87f6fe16eaedc99a954':
logd: pidToUid incorrect
2015-04-14 20:20:39 +00:00
Mark Salyzyn
35d09b6928
Merge "logd: pidToUid incorrect"
2015-04-14 20:13:38 +00:00
Mark Salyzyn
c32afdf913
logd: pidToUid incorrect
...
Change-Id: I9b0e655780924db125568179771e57b01e80aaae
2015-04-14 13:07:29 -07:00
Yabin Cui
03dca28def
Fix alignment when reading note segment.
...
ELF said that padding is present, if necessary, to ensure 4-byte
alignment for the descriptor and next note entry, but such padding
is not included in namesz and descsz.
Change-Id: I7896783f3d9a787772d56c49905f52a493c9fba1
2015-04-14 10:27:54 -07:00
Ed Tam
d0b6de41f8
Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
2015-04-13 23:37:52 +00:00
Ed Tam
438443e742
resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp
...
Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
2015-04-13 16:29:05 -07:00
Tom Cherry
17b6a39f04
am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"
...
* commit 'af59eec776860514a70443dd94a1bcd130ed0ced':
Fix memory leak in parse_action
2015-04-13 21:31:36 +00:00
Tom Cherry
af59eec776
am e83d8a69: Merge "Fix memory leak in parse_action"
...
* commit 'e83d8a6900ee53942e5939656c3b6ae177d1f1d2':
Fix memory leak in parse_action
2015-04-13 21:18:42 +00:00
Tom Cherry
e83d8a6900
Merge "Fix memory leak in parse_action"
2015-04-13 21:11:42 +00:00
Tom Cherry
ae392cf609
Fix memory leak in parse_action
...
Change-Id: I3ed1da5674ae0b4ac50c1925e4f63af7f1748483
2015-04-13 13:37:20 -07:00
Mark Salyzyn
51c6ad178e
am c9fc3db5: am 7746546b: Merge "logcat: build regression"
...
* commit 'c9fc3db55b6a54dde740ba558a98835ea6552190':
logcat: build regression
2015-04-13 17:16:30 +00:00
Mark Salyzyn
c9fc3db55b
am 7746546b: Merge "logcat: build regression"
...
* commit '7746546b89bf2da44eb058a4053dd4505d00d824':
logcat: build regression
2015-04-13 17:05:59 +00:00
Mark Salyzyn
7746546b89
Merge "logcat: build regression"
2015-04-13 16:56:39 +00:00
Mark Salyzyn
77d7e81c1c
logcat: build regression
...
printflike checks for NULL fmt at compile time, checks for
NULL at runtime are optimized out. Regression as a result
of commit 5976303aa6 .
Change-Id: Ia4e7ee4b6cb2adf1e6609c70e79684855f76e6fc
2015-04-13 09:27:57 -07:00
Mark Salyzyn
a4be1b72b9
am 7249f69a: am b9a41bdb: Merge "logcat: Minor fixes"
...
* commit '7249f69a987fd21b6903d01ed372dc355a0163ea':
logcat: Minor fixes
2015-04-13 16:10:21 +00:00
Mark Salyzyn
7249f69a98
am b9a41bdb: Merge "logcat: Minor fixes"
...
* commit 'b9a41bdb079932d2ce119b4c8e6615531a6471e0':
logcat: Minor fixes
2015-04-13 16:01:13 +00:00
Mark Salyzyn
b9a41bdb07
Merge "logcat: Minor fixes"
2015-04-13 15:55:09 +00:00
Mark Salyzyn
8bd044fc8b
am 3c5e3a82: am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480d
...
* commit '3c5e3a8251615c857804d4f39e54d1ee263983f9':
logd: disable worst uid prune for events buffer
Revert: "logd: default off by-UID spam filter"
logd: annotate worst-UID pruned entries
2015-04-13 14:31:17 +00:00
Mark Salyzyn
3c5e3a8251
am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480d
...
* commit '8913dec51d33f93e8e96fdd12c8112c5cc7dbb78':
logd: disable worst uid prune for events buffer
Revert: "logd: default off by-UID spam filter"
logd: annotate worst-UID pruned entries
2015-04-13 14:21:39 +00:00
Mark Salyzyn
8913dec51d
Merge changes Iddd45a67,Ifdc20b09,Ibc68480d
...
* changes:
logd: disable worst uid prune for events buffer
Revert: "logd: default off by-UID spam filter"
logd: annotate worst-UID pruned entries
2015-04-13 14:14:20 +00:00
Neil Fuller
90014d61c8
am 532d0a11: am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed"
...
* commit '532d0a11c439b101ac2d26f6fdc44f9791f6d0ad':
Executable to run on boot that removes old tzdata if needed
2015-04-13 11:58:51 +00:00
Neil Fuller
532d0a11c4
am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed"
...
* commit '9b83b62305634b49e67f53a73eda14cea480029e':
Executable to run on boot that removes old tzdata if needed
2015-04-13 11:47:38 +00:00
Neil Fuller
9b83b62305
Merge "Executable to run on boot that removes old tzdata if needed"
2015-04-13 11:41:00 +00:00