Commit Graph

6954 Commits

Author SHA1 Message Date
Kristian Monsen 9aaba5cad1 am 8c6b9b0d: Merge "Fixes some warnings"
* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
  Fixes some warnings
2014-01-28 19:57:33 +00:00
Kristian Monsen 8c6b9b0d95 Merge "Fixes some warnings" 2014-01-28 19:33:12 +00:00
Kristian Monsen b5a9890f90 Fixes some warnings
- Implicit decleared function
- Unused variable

Change-Id: Ia701e66682cb6788f0716a2ef7556ed07227f78f
2014-01-28 11:28:32 -08:00
Benoit Goby 68a74ec483 am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"
* commit '6ddabb7a1cc3080ae773acb045f69b5e6afee87a':
  adbd: Don't close/reopen FFS ep0 on disconnect
2014-01-28 00:43:37 +00:00
Benoit Goby 6ddabb7a1c Merge "adbd: Don't close/reopen FFS ep0 on disconnect" 2014-01-28 00:07:15 +00:00
Nick Kralevich 9b16f7db5c am 6bfb7b64: Merge "Fix overflow in adb_client"
* commit '6bfb7b64ba857f78c0a0bcb08591003655df2b7e':
  Fix overflow in adb_client
2014-01-27 14:33:15 -08:00
Nick Kralevich 6bfb7b64ba Merge "Fix overflow in adb_client" 2014-01-27 22:26:13 +00:00
Nick Kralevich 75e0645921 Fix overflow in adb_client
Credit: Joshua Drake
Bug: 12060953

(cherry picked from commit e89e09dd2b)

Change-Id: I8a9b2592a5e4f7527c607abfe4ea6df6eb550aa8
2014-01-27 14:12:34 -08:00
Christopher Ferris 57c9b95b1f am 39baa829: Merge "Get arm64 to compile."
* commit '39baa8296d39edfb25f5f2a4673f6a303e1245c5':
  Get arm64 to compile.
2014-01-27 14:04:36 -08:00
Christopher Ferris 39baa8296d Merge "Get arm64 to compile." 2014-01-27 21:59:16 +00:00
Christopher Ferris edbe3b4b56 Get arm64 to compile.
Change-Id: Ica021aa134388fe7069a5de5df8036ecf0d570f8
2014-01-27 10:52:08 -08:00
Elliott Hughes 3d55662f17 am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."
* commit 'fb6d601f5ae99a59a16f87950a15b9ed3d175db7':
  Use <stdint.h> for INT32_MIN and INT32_MAX.
2014-01-24 17:30:02 -08:00
Elliott Hughes fb6d601f5a Merge "Use <stdint.h> for INT32_MIN and INT32_MAX." 2014-01-25 01:25:50 +00:00
Elliott Hughes 81eb357b58 Use <stdint.h> for INT32_MIN and INT32_MAX.
Bug: 12708004
Change-Id: I99f222b2db1d128abf6ffbf7173a5aaff48f8e85
2014-01-24 16:08:03 -08:00
Colin Cross 02f68c4b5f am 4800e20e: Merge "system/core: rename aarch64 target to arm64"
* commit '4800e20eafacabe76e56183aa82797ac5c4057c1':
  system/core: rename aarch64 target to arm64
2014-01-24 12:38:55 -08:00
Colin Cross 4800e20eaf Merge "system/core: rename aarch64 target to arm64" 2014-01-24 20:32:49 +00:00
Brian Carlstrom e18df357a4 am 794b587b: Merge "Fix entry handling for 0 length entries."
* commit '794b587b37e3f32c081e5fdc084581be9d68292d':
  Fix entry handling for 0 length entries.
2014-01-24 10:22:34 -08:00
Brian Carlstrom 794b587b37 Merge "Fix entry handling for 0 length entries." 2014-01-24 18:18:12 +00:00
Nick Kralevich 1638431224 am 0620e3dd: Merge "adbd: switch to su domain when running as root"
* commit '0620e3ddb85582f66612d046d1295dc20bf1a4f5':
  adbd: switch to su domain when running as root
2014-01-24 10:06:46 -08:00
Nick Kralevich 0620e3ddb8 Merge "adbd: switch to su domain when running as root" 2014-01-24 17:59:39 +00:00
Narayan Kamath 48953a1b8f Fix entry handling for 0 length entries.
Two minor issues were fixed:
- The offset to entry data can be the same as the
  central directory offset when the last entry in the
  file has length 0 and is stored (not deflated). Fix
  a check that disallowed this. We already have a strict
  check that entry data must end before the central directory,
  so we're covered.
- We would attempt to map a segment of length 0 when writing
  an entry whose length is 0. We should just return early in
  this case.

bug: 12623277
Change-Id: I2a4ca0c4d170cc3cbf326e5ca13894acd9c434c9
2014-01-24 13:41:55 +00:00
Colin Cross d4146e6091 system/core: rename aarch64 target to arm64
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 18:01:14 -08:00
Colin Cross 4b53b0147a am 5bd11b48: Merge changes Ib13d9654,I98723ccd
* commit '5bd11b48875846b304e782afc537b4b4b8a6eb39':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier
2014-01-23 16:31:33 -08:00
Colin Cross 5bd11b4887 Merge changes Ib13d9654,I98723ccd
* changes:
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier
2014-01-24 00:26:59 +00:00
Colin Cross 65dd88becc system/core: remove $(KERNEL_HEADERS) from includes
The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.

Change-Id: Ib13d96543f2c97b1b487a46e1748ceb2c5724169
2014-01-22 19:06:04 -08:00
Colin Cross 3510637c85 libcutils: fix atomic_memory_store_barrier
dmb isht is not a valid instruction, fix it to be dmb ishst
(data memory barrier, inner shareable, on writes).

Change-Id: I98723ccd8618b7863cb55da53dc29b979c9905a5
2014-01-22 19:04:28 -08:00
Nick Kralevich d49aa2537c adbd: switch to su domain when running as root
When adbd runs as root, it should transition into the
su domain. This is needed to run the adbd and shell
domains in enforcing on userdebug / eng devices without
breaking developer workflows.

Introduce a new device_banner command line option.

Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
2014-01-22 14:20:17 -08:00
Nick Kralevich ca53f0a084 don't load property_contexts from /data
Bug: 12613118

(cherry picked from commit dc3a42bb11)

Change-Id: If630478b0e3fdda8c1c14b3f41b717085acf9914
2014-01-22 12:17:36 -08:00
Christopher Ferris 719b0198a3 am 1db584b8: Merge "Attempt to fix Mac build"
* commit '1db584b899dffca884c3842c07da189f7c9af470':
  Attempt to fix Mac build
2014-01-18 15:50:37 -08:00
Christopher Ferris 1db584b899 Merge "Attempt to fix Mac build" 2014-01-18 23:47:21 +00:00
Brian Carlstrom db5911a08a Attempt to fix Mac build
Change-Id: I1364255bfed7788a35531962508bad804b8d5b7f
2014-01-18 13:55:54 -08:00
Nick Kralevich 78af6c4c94 am 0a72d293: Merge "Fix "adb push /sdcard/filename""
* commit '0a72d2930adcd3b3504448f71b25ebb88c2cc3cf':
  Fix "adb push /sdcard/filename"
2014-01-17 17:05:19 -08:00
Nick Kralevich 0a72d2930a Merge "Fix "adb push /sdcard/filename"" 2014-01-18 01:01:11 +00:00
Nick Kralevich 72917837e6 Fix "adb push /sdcard/filename"
Don't assume that calling chown(filename, getuid(), getgid())
will always succeed. In the case of /sdcard, a file you create
will be owned by root, so the chown call will fail.

Instead, use uid=gid=-1 so that the chown call is truly a no-op.

Ignore the results of calling chmod. Again, for /sdcard, the
chmod call will never succeed, because the file isn't owned by
the shell user.

Bug: 12441485
Change-Id: I11eaf1d6f6049c1158afc29754fbb7af2baf2c78
2014-01-17 16:16:42 -08:00
Elliott Hughes f62b602f45 am 6192eedb: Merge "Fix \'r\' for LP64."
* commit '6192eedb43bfa949569850b5cf4a6550b2c62f08':
  Fix 'r' for LP64.
2014-01-17 11:19:49 -08:00
Christopher Ferris f7adcfc8bd am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit '17b9c82765a325d88fc2e8920f9df3155c5773e2':
  Add PROT_* constants not found on windows.
2014-01-17 11:19:48 -08:00
Christopher Ferris 237fdb4a95 am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
* commit 'eb8d73b675d8d9613310b5d5e5865571b98d6f78':
  Rewrite libbacktrace to be all C++.
2014-01-17 11:19:48 -08:00
Elliott Hughes 6192eedb43 Merge "Fix 'r' for LP64." 2014-01-17 18:03:40 +00:00
Elliott Hughes 2430a064bd Fix 'r' for LP64.
Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
2014-01-17 09:50:56 -08:00
Christopher Ferris 17b9c82765 Merge "Add PROT_* constants not found on windows." 2014-01-17 16:26:37 +00:00
Christopher Ferris 0dbce4564b Add PROT_* constants not found on windows.
Change-Id: Ic515363ed66dfb2d8e1a6fdfa274508b3a91311d
2014-01-17 08:25:26 -08:00
Christopher Ferris eb8d73b675 Merge "Rewrite libbacktrace to be all C++." 2014-01-17 15:07:18 +00:00
Christopher Ferris 46756821c4 Rewrite libbacktrace to be all C++.
This includes removing the map_info.c source and replacing it with the
BacktraceMap class to handle all map related code.

Change all callers of libbacktrace map functionality.

Also modify the corkscrew thread code so that it doesn't need to build
the map twice (once in the corkscrew format and once in the libbacktrace
format).

Change-Id: I32865a39f83a3dd6f958fc03c2759ba47d12382e
2014-01-16 16:12:29 -08:00
Elliott Hughes e20b5f71c0 am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit '524b3a0c40fcca4b2259f317b2d098434998ce47':
  Remove obsolete 'setconsole' command.
2014-01-16 16:00:58 -08:00
Elliott Hughes 524b3a0c40 Merge "Remove obsolete 'setconsole' command." 2014-01-16 23:55:50 +00:00
Elliott Hughes c1e91b0034 Remove obsolete 'setconsole' command.
Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
2014-01-16 14:50:23 -08:00
Elliott Hughes 97373bbc71 am 7cd15614: Merge "system/core 64-bit cleanup."
* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
  system/core 64-bit cleanup.
2014-01-16 14:05:24 -08:00
Elliott Hughes 7cd1561410 Merge "system/core 64-bit cleanup." 2014-01-16 21:59:58 +00:00
Elliott Hughes ccecf14254 system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.

Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
2014-01-16 12:54:18 -08:00
Nick Kralevich a6b65eeef1 am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"
* commit '7580661df179eb037c0dbe96e3bde1bc9e6bfbdc':
  fs_mgr: increase verboseness on mount errors
2014-01-16 11:19:51 -08:00