Commit graph

6688 commits

Author SHA1 Message Date
Nick Kralevich
e4335483e7 Merge "Relabel /data/misc/zoneinfo" 2013-12-16 16:59:19 +00: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
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
d5f97db507 Merge "libion: Use %zu for size_t" 2013-12-13 17:38:23 +00:00
Elliott Hughes
a67b39cb61 Merge "Pixelflinger: Fix issue of pointers being stored in ints" 2013-12-12 21:22:33 +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
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
8779c4eab4 Merge "Minor cleanups." 2013-12-11 22:46:35 +00: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
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
a183f45f7a Merge "Add unit tests for libziparchive." 2013-12-10 17:52:58 +00: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
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
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
Narayan Kamath
ac3ab308f6 Merge "Fix Mac OS build for libziparchive." 2013-12-06 18:30:20 +00:00
Narayan Kamath
574c3b35df Fix Mac OS build for libziparchive.
BSD off_t are implicitly 64 bit so the platform
doesn't define off64_t.

Change-Id: I51cbe94ead01d2d6bc7c5010d9472487bee7c2d3
2013-12-06 18:27:53 +00:00
Narayan Kamath
51a1d4e3f6 am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8':
  Unify zipfile implementations : Step 1.
2013-12-06 05:37:39 -08:00
Narayan Kamath
a2125077e1 Merge "Unify zipfile implementations : Step 1." 2013-12-06 13:35:17 +00:00
The Android Open Source Project
7fc7a07b23 Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD 2013-12-05 12:38:34 -08:00
Colin Cross
02ac0bfdc1 Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* changes:
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-04 23:11:55 +00:00
Elliott Hughes
9536b8c997 Fix fastbootd's <linux/kexec.h> reference.
Change-Id: I28ce0288a6377153a96d3a98d6913d1271e3112f
2013-12-04 15:00:52 -08:00
Szymon Starzycki
baf4c4bdef Fastbootd: Comments and general cleaning
Alignment fix for fastbootd gpt_mmap

Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
2013-12-04 15:00:52 -08:00
Szymon Starzycki
55b61f4c9b Fastbootd: General fixes and changes
read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library

Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
2013-12-04 15:00:52 -08:00
Szymon Starzycki
4662a114a4 Revert "Revert "Fastbootd: flashing certification""
CMS functionality is now available

This reverts commit 068b71dd9c.

Conflicts:
	fastbootd/Android.mk
	fastbootd/fastbootd.c
	fastbootd/utils.c
	fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
2013-12-04 15:00:52 -08:00
Szymon Starzycki
27ea99fb99 Fastbootd: auto ssh server start
Change-Id: I3e9c53c3d834726c3747e9ee0665ed027f55b08c
2013-12-04 15:00:52 -08:00
Szymon Starzycki
bc849f1453 Fastbootd: network auto discovery
Change-Id: I91082f5832412e775244b3974c0ab00952905ad5
2013-12-04 15:00:52 -08:00
Szymon Starzycki
2a656c332b Fastbootd: socket and network transport
Change-Id: I395e5361d0484bd11421225c152f9aec00305f11
2013-12-04 15:00:52 -08:00
Szymon Starzycki
00f4e93730 Fastbootd: build breakage fix
Change-Id: I6a01ff6f785adc58581d0d9f44e71c94cbb4e3b5
2013-12-04 15:00:52 -08:00
Colin Cross
b80e4c725d Revert "Fastbootd: flashing certification"
This reverts commit 5ccecfd26d.

Change-Id: I0ca31094c115e14982a27c258d9139a723da8428
2013-12-04 15:00:52 -08:00
Szymon Starzycki
5621248d74 Fastbootd: flashing certification
Change-Id: I564086908942463eebee69449d484ba03effc50e
2013-12-04 15:00:51 -08:00
Szymon Starzycki
b88fa3292d Fastbootd: improved operations on gpt
Change-Id: Ieabdcb1c52094d7408b169681e073ebf6613af20
2013-12-04 15:00:51 -08:00
Elliott Hughes
ae2e69b9c0 Remove a homebrew mmap64.
This should have been fixed in bionic, and now has been.

Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
2013-12-04 15:00:51 -08:00
Szymon Starzycki
c50dfd178e Fastbootd: fixed missing file in Android.mk
Change-Id: I10927f488e35c688483f2d1d8c9f5b7ea1d7912d
2013-12-04 15:00:51 -08:00
Szymon Starzycki
b6c5f2880e fastbootd: erase, boot and partitioning commands
Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
2013-12-04 15:00:51 -08:00
Narayan Kamath
7462f02f82 Unify zipfile implementations : Step 1.
Extract zip file processing logic from libdvm into a
standalone library.

This library is a stricter than the libdvm library in
several ways:
- Duplicate zip entry names are now disallowed. Files with
  such entries will fail to parse.
- We now verify CD file size information with the individual
  file header information. (This was pointed out as a deficiency
  of this implementation in past discussions.)
- We also add support for crc checking, which means we might
  need to parse the optional data descriptor footer (if one
  exists).

We also provide an API for iterating over the entries of
a zip file. This library is optimized for two use cases :

- Lookup for a single entry in the file, with the intention
  of processing or extracting the data associated with that
  entry
- Iterating over all entries in a file *and* processing
  / extracting their data.

Change-Id: Ia87de6184ef753cc470b0af755c47a4f92ac8198
2013-12-04 13:28:40 +00:00
Greg Hackmann
b097ece827 Merge "libadf: add helper to set up a simple post" 2013-12-03 18:31:00 +00:00
Greg Hackmann
0e292002c2 Merge "libadf: filter overlay engines by a list of acceptable formats" 2013-12-03 18:28:41 +00:00
Greg Hackmann
4635df3433 Merge "add libadfhwc" 2013-12-03 18:27:58 +00:00
Greg Hackmann
4b95c2bbf0 Merge "add libadf" 2013-12-03 18:27:36 +00:00
Nick Kralevich
8dfdf650ab Minor cleanups.
Use ssize_t for handling the result of a readlink call.

Fix the following compiler warning:

  system/core/toolbox/ls.c: In function 'listfile_maclabel':
  system/core/toolbox/ls.c:238:68: warning: unused parameter 'flags' [-Wunused-parameter]
   static int listfile_maclabel(const char *path, struct stat *s, int flags)

Change-Id: Idd65f3349fb9dfb6f7a374c81f72d3169af33505
2013-11-27 16:12:48 -08:00
Nick Kralevich
71e096c894 Merge "Increase buffer size, use bounds checking functions" 2013-11-27 23:57:20 +00:00