Commit Graph

7336 Commits

Author SHA1 Message Date
Narayan Kamath f591bbc247 am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit '51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c':
  Unify zipfile implementations : Step 1.
2013-12-06 05:39:41 -08: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 1f9b04a304 am f02af525: am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD
* commit 'f02af525738583ca42a3cbfea00b868de7281aeb':
2013-12-06 01:38:40 +00:00
The Android Open Source Project f02af52573 am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD
* commit '7fc7a07b237e0887f3815822c4551b9968267b37':
2013-12-05 17:25:40 -08:00
Todd Poynor 67ee1205b1 am 9bc73047: (-s ours) am 3f17bda8: am a41611f6: healthd: fix botched logging call
* commit '9bc73047b59cdff412cfc647018a69a69d36ae3d':
2013-12-05 22:45:53 +00:00
Elliott Hughes 30cd0fc4f6 am f183a42f: (-s ours) am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
* commit 'f183a42fb39f008c13e6ffdaa28766f8b78b43d3':
2013-12-05 22:45:53 +00:00
The Android Open Source Project 7fc7a07b23 Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD 2013-12-05 12:38:34 -08:00
Todd Poynor 9bc73047b5 am 3f17bda8: am a41611f6: healthd: fix botched logging call
* commit '3f17bda89498509fd56c3578ebff51ec0c2fb33f':
2013-12-05 19:46:58 +00:00
Elliott Hughes f183a42fb3 am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
* commit '49f2e1cedfcf1dac72efe6e3634a3cd2db299e30':
  Add USB Vendor ID for MSI
2013-12-05 19:46:12 +00:00
Mark Salyzyn c1215c0b46 liblog: whitespace cleanup
- change cutils to liblog directory path
- change tabs to spaces

Change-Id: I7d9db1e2b817ba0ec9a224340c5c7535a2387fd5
2013-12-05 07:33:21 -08:00
Mark Salyzyn 8e71ddeac0 libcutils: bug str_parms.c:str_parms_get_float().
str_parms_get_float did not return the output into
*val. Only output if returning with no error. Audit
shows no internal users of this library function

Change-Id: I14a3f08a098072a159dd93f85ead36b3f445816f
2013-12-05 07:33:21 -08:00
Mark Salyzyn ba02cd1e9b libcutils: UNUSED argument warnings
Change-Id: Ie427d481298af8d911bb2b157ebba30954335354
2013-12-05 07:33:21 -08:00
Mark Salyzyn 696f267ff5 libsysutils: Get rid of warnings
- UNUSED argument warnings
- Remove LOG_NDEBUG define

Change-Id: I48b0942adfdb7a46a7693e580bc6ed5a685b0d5b
2013-12-05 07:33:21 -08:00
Mark Salyzyn 0ea3624b3e libcutils: Move list.c to inlines on list.h
Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
2013-12-05 07:33:21 -08:00
Carton He dd8fddd503 Fix tracing on user builds
Need the set correct permission for print-tgid option or tracing of
sched can't work on user build.

Change-Id: Ia88aabe58128b911afd78f01c27f7da884ed03f0
Signed-off-by: Carton He <carton.he@marvell.com>
2013-12-05 14:24:03 +08:00
Colin Cross 91a4160f5c am 26321284: am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* commit '263212845432865236b9b6ccdca807385603db68':
  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-05 02:45:20 +00:00
Colin Cross 2632128454 am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* commit '02ac0bfdc1c80a2f18487d28aa56dcd8499de246':
  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 15:18:10 -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
JP Abgrall 58c5303649 adb: Don't clobber block devices during push
In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

   adb shell ls -l /dev/block/mmcblk0p8
     # brw------- root     root     179,   8 2013-11-28 07:43 mmcblk0p8
   adb push n7.jpa.mda.post_jb_encryption.raw  /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
2013-12-03 14:52:39 -08:00
Greg Hackmann db7d933b98 am 0ddf436e: am b097ece8: Merge "libadf: add helper to set up a simple post"
* commit '0ddf436ef9450b7ecd4bce1206758f8d75267bfa':
  libadf: add helper to set up a simple post
2013-12-03 18:44:14 +00:00
Greg Hackmann 4e053f2df9 am b88d8e50: am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"
* commit 'b88d8e50645fc03f61e65cadac280c80fe14e50e':
  libadf: filter overlay engines by a list of acceptable formats
2013-12-03 18:44:14 +00:00
Greg Hackmann b6a32b6188 am b11ab0f4: am 4635df34: Merge "add libadfhwc"
* commit 'b11ab0f497121c4f4ce9ea8648fe4f8e22faa124':
  add libadfhwc
2013-12-03 18:44:13 +00:00
Greg Hackmann dfb61e9098 am 67afb1fa: am 4b95c2bb: Merge "add libadf"
* commit '67afb1fa399d3a64e639cb9051fa62caab56ffa8':
  add libadf
2013-12-03 18:44:12 +00:00
Greg Hackmann 0ddf436ef9 am b097ece8: Merge "libadf: add helper to set up a simple post"
* commit 'b097ece8271d13c7852d77c1784e237301e7e617':
  libadf: add helper to set up a simple post
2013-12-03 10:38:52 -08:00
Greg Hackmann b88d8e5064 am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"
* commit '0e292002c2da581bc0ff2bbc3d057bfe2f573d44':
  libadf: filter overlay engines by a list of acceptable formats
2013-12-03 10:35:29 -08:00
Greg Hackmann b11ab0f497 am 4635df34: Merge "add libadfhwc"
* commit '4635df3433780371ff59e9c9c4577a7ca8d53f7f':
  add libadfhwc
2013-12-03 10:35:28 -08:00
Greg Hackmann 67afb1fa39 am 4b95c2bb: Merge "add libadf"
* commit '4b95c2bbf096b6438673659547914ae61ac4f127':
  add libadf
2013-12-03 10:35:28 -08: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 f374fb84af am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking functions"
* commit '5e362c871a7b79b12e91a8737606988163f84dcf':
  Increase buffer size, use bounds checking functions
2013-12-02 23:31:11 +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 5e362c871a am 71e096c8: Merge "Increase buffer size, use bounds checking functions"
* commit '71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7':
  Increase buffer size, use bounds checking functions
2013-11-27 16:05:24 -08:00