Elliott Hughes
7fe10dedfd
am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
...
* commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 10:59:19 -08:00
Elliott Hughes
cadb10c957
Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
2013-12-16 18:55:09 +00:00
Nick Kralevich
02ad8700dd
am e4335483: Merge "Relabel /data/misc/zoneinfo"
...
* commit 'e4335483e78292800e27c7bf0a67d23bee47dc84':
Relabel /data/misc/zoneinfo
2013-12-16 09:04:04 -08:00
Nick Kralevich
e4335483e7
Merge "Relabel /data/misc/zoneinfo"
2013-12-16 16:59:19 +00:00
Elliott Hughes
feb539b6e3
am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"
...
* commit 'e1a475c0b4b73ec72fae12ea310b038d87a71b0e':
Force alignment of data buffer used to process netlink messages
2013-12-13 16:17:24 -08:00
Elliott Hughes
e1a475c0b4
Merge "Force alignment of data buffer used to process netlink messages"
2013-12-14 00:13:32 +00:00
Nick Kralevich
354e9edbd7
Relabel /data/misc/zoneinfo
...
The files in zoneinfo changed from system_data_file to
zoneinfo_data_file. Fixup pre-existing files.
Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
2013-12-13 16:03:48 -08:00
Narayan Kamath
d61266d016
am 4928d8d0: Merge "Fix ExtractEntryToFile."
...
* commit '4928d8d072b5fab695f88437987c4be10781f40c':
Fix ExtractEntryToFile.
2013-12-13 10:16:19 -08:00
Narayan Kamath
4928d8d072
Merge "Fix ExtractEntryToFile."
2013-12-13 18:13:01 +00:00
Narayan Kamath
00a258cec7
Fix ExtractEntryToFile.
...
We would always write uncompressed data at offset 0 instead
of the current filedescriptor offset.
Also adds a unit-test & a clarifying comment on the API.
Change-Id: If44757e96dde504ce63d81b4dec7115fc6f6d5fb
2013-12-13 17:56:57 +00:00
Elliott Hughes
f595365fef
am d5f97db5: Merge "libion: Use %zu for size_t"
...
* commit 'd5f97db507f47b0db0d15c8a809ce33c46391228':
libion: Use %zu for size_t
2013-12-13 09:45:20 -08:00
Elliott Hughes
d5f97db507
Merge "libion: Use %zu for size_t"
2013-12-13 17:38:23 +00:00
Elliott Hughes
5b8daae044
am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
...
* commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384':
Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 13:25:36 -08:00
Elliott Hughes
a67b39cb61
Merge "Pixelflinger: Fix issue of pointers being stored in ints"
2013-12-12 21:22:33 +00:00
Ashok Bhat
bfc6dc4ca8
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
...
GGLAssembler assumes addresses to be 32-bit and uses ARM 32-bit
instructions to load/store/manipulate addresses. To support, 64-bit
architectures, following changes has been done
1. ARMAssemblerInterface has been extended to support four new
operations ADDR_LDR, ADDR_STR, ADDR_SUB, ADDR_ADD. Base class
implements these virtual functions to use 32bit equivalent
function. This avoids existing 32-bit Assembler backend
implementations like ARMAssembler and MIPSAssembler from
mapping the new functions to existing equivalent routines.
This also allows 64-bit Architectures like AArch64 to override
the function in their assembler backend implementations.
2. GGLAssembler code (spread over GGLAssembler.cpp, GGLAssembler.h
and texturing.cpp) has been changed to use the new operations
for address operations.
Change-Id: I3d7eace4691e3e47cef737d97ac67ce6ef4fb18d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Ashok Bhat
d10afb1748
Pixelflinger: Fix issue of pointers being stored in ints
...
Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.
Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Narayan Kamath
3a5ab80d0f
am 7d92b7cc: Merge "Get rid of some log spam."
...
* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
Get rid of some log spam.
2013-12-12 09:25:29 -08:00
Narayan Kamath
7d92b7cc65
Merge "Get rid of some log spam."
2013-12-12 17:19:40 +00:00
Narayan Kamath
f6a196522a
Get rid of some log spam.
...
We don't need a warning if an entry isn't found in a zip
file. It can happen as part of normal operation.
Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
2013-12-12 10:29:31 +00:00
Nick Kralevich
f0a68b54be
am 8779c4ea: Merge "Minor cleanups."
...
* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
Minor cleanups.
2013-12-11 14:50:20 -08:00
Nick Kralevich
8779c4eab4
Merge "Minor cleanups."
2013-12-11 22:46:35 +00:00
Narayan Kamath
841ef3bd20
am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
...
* commit 'bcf1454cf6a2fadc30c5189c3756b3cb96149745':
Use FileMap from libcutil instead of rolling our own.
2013-12-11 09:40:03 -08:00
Narayan Kamath
bcf1454cf6
Merge "Use FileMap from libcutil instead of rolling our own."
2013-12-11 17:33:58 +00:00
Narayan Kamath
eaf988532b
Use FileMap from libcutil instead of rolling our own.
...
Adds windows support as a side effect.
Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
2013-12-11 15:17:06 +00:00
Nick Kralevich
a91a47c30c
am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
Fix overflow in adb_client
2013-12-10 12:42:20 -08:00
Nick Kralevich
b2dfa7ece7
am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
Fix overflow in adb_client
2013-12-10 12:39:32 -08:00
Nick Kralevich
02d90b92ce
am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
Fix overflow in adb_client
2013-12-10 12:37:32 -08:00
Nick Kralevich
33e7f915d6
am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
Fix overflow in adb_client
2013-12-10 12:31:17 -08:00
Nick Kralevich
54a80bcf88
am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
Fix overflow in adb_client
2013-12-10 12:29:05 -08:00
Nick Kralevich
cd072e94cf
am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'ba104fb7f1f0acad99a0d3a1cf7153aab57ea450':
Fix overflow in adb_client
2013-12-10 12:25:59 -08:00
Nick Kralevich
ba104fb7f1
am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'e975716e36c9ad6aa80be2b54ee2cc63eadbdc44':
Fix overflow in adb_client
2013-12-10 12:22:50 -08:00
Nick Kralevich
e975716e36
am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
Fix overflow in adb_client
2013-12-10 12:20:08 -08:00
Nick Kralevich
03d4eb2900
am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
Fix overflow in adb_client
2013-12-10 12:17:45 -08:00
Nick Kralevich
d63fb078ae
am e89e09dd: Fix overflow in adb_client
...
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
Fix overflow in adb_client
2013-12-10 12:14:44 -08:00
Nick Kralevich
e89e09dd2b
Fix overflow in adb_client
...
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
2013-12-10 10:18:10 -08:00
Ashok Bhat
aed6bec414
libion: Use %zu for size_t
...
Change-Id: If92fc31ab676a569530c21e655a1b5b451f5c5e5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-10 18:13:04 +00:00
Narayan Kamath
44eb13570f
am a183f45f: Merge "Add unit tests for libziparchive."
...
* commit 'a183f45f7aaee721a9c1cde14cdd47e47a1592e4':
Add unit tests for libziparchive.
2013-12-10 09:58:08 -08:00
Narayan Kamath
a183f45f7a
Merge "Add unit tests for libziparchive."
2013-12-10 17:52:58 +00:00
Narayan Kamath
0c2e454cf4
am 404c5408: Merge "Fix return code for ended iteration."
...
* commit '404c5408a0be7cc42d3c1c4af4e87b7daed39862':
Fix return code for ended iteration.
2013-12-10 09:49:40 -08:00
Nick Kralevich
b988e95c10
am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."
...
* commit '6fec3a23046a3100c2ce1863afdd0191da69cdcc':
Log a warning on services that lack SELinux domains.
2013-12-10 09:49:39 -08:00
Narayan Kamath
404c5408a0
Merge "Fix return code for ended iteration."
2013-12-10 17:46:14 +00:00
Narayan Kamath
58aaf46e4d
Add unit tests for libziparchive.
...
- Add a build rule for host tests
- Add basic tests for Find / Iterate and Extract
for both deflated & stored entries.
- Fix an off by one error that the test uncovered.
Change-Id: If72009b1ea9791d5a265829f05c32ffe1c2752c4
2013-12-10 16:48:50 +00:00
Nick Kralevich
6fec3a2304
Merge "Log a warning on services that lack SELinux domains."
2013-12-09 23:30:36 +00:00
Stephen Smalley
af06c6745b
Log a warning on services that lack SELinux domains.
...
Sample output on flo:
<3>[ 7.270568] init: Warning! Service irsc_util needs a SELinux domain defined; please fix!
<3>[ 8.290832] init: Warning! Service bootanim needs a SELinux domain defined; please fix!
Change-Id: If5514b188517917d58ee81c446af563b0443be45
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-09 15:40:24 -05:00
Nick Kralevich
7d1f3a3daa
am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."
...
* commit 'bdf53e2a59654d2b1e8469616f1b0175b275219d':
Do not change ownership on /sys/fs/selinux/enforce.
2013-12-09 10:35:41 -08:00
Nick Kralevich
bdf53e2a59
Merge "Do not change ownership on /sys/fs/selinux/enforce."
2013-12-09 18:18:24 +00:00
Narayan Kamath
eb41ad212e
Fix return code for ended iteration.
...
The API promises a return code of -1 for an
ended iteration and lower negative values for
errors.
Change-Id: I688a1ee2efad1bdfc6959cf27e49c0426ebf27f8
2013-12-09 16:26:36 +00:00
Stephen Smalley
17bec835d5
Do not change ownership on /sys/fs/selinux/enforce.
...
There is no longer any reason to permit system UID to set enforcing mode.
Change-Id: Ie28beed1ca2b215c71f2847e2390cee1af1713c3
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-09 10:23:16 -05:00
Narayan Kamath
cb7092d9f6
am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."
...
* commit '48a6d3de590714f4e913c6cc3135a455126df91d':
Fix Mac OS build for libziparchive.
2013-12-06 10:33:39 -08:00
Narayan Kamath
48a6d3de59
am ac3ab308: Merge "Fix Mac OS build for libziparchive."
...
* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
Fix Mac OS build for libziparchive.
2013-12-06 10:32:07 -08:00