Christopher Ferris
8d12b4a090
am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."
...
* commit '4fe489665fef420210cd2e9ac1a682f8bfb950e9':
Get arm64 to compile.
2014-01-27 22:19:30 +00:00
Christopher Ferris
4fe489665f
am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."
...
* commit '57c9b95b1f62ceec18c56ac10fb137a96e7a2287':
Get arm64 to compile.
2014-01-27 22:11:42 +00: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
02d7fc0551
am e75cc3d4: am 3d55662f: am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."
...
* commit 'e75cc3d4fde81fbb1d0f2617d86c330425f29022':
Use <stdint.h> for INT32_MIN and INT32_MAX.
2014-01-25 01:35:02 +00:00
Elliott Hughes
e75cc3d4fd
am 3d55662f: am fb6d601f: Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."
...
* commit '3d55662f177df98f887c1c53b694daa1c2e7e612':
Use <stdint.h> for INT32_MIN and INT32_MAX.
2014-01-25 01:33:02 +00: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
9222d911a8
am c8518616: am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"
...
* commit 'c8518616ed1d98afc0a1b5a75a4b009a1931568d':
system/core: rename aarch64 target to arm64
2014-01-24 20:44:31 +00:00
Colin Cross
c8518616ed
am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"
...
* commit '02f68c4b5f453c2192a1cd495439345bcdad879e':
system/core: rename aarch64 target to arm64
2014-01-24 20:41:45 +00: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
e490b6155e
am 72235773: am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."
...
* commit '722357738fd8dea75d147dbc8d8d59c72c7ec7dd':
Fix entry handling for 0 length entries.
2014-01-24 18:26:15 +00:00
Brian Carlstrom
722357738f
am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."
...
* commit 'e18df357a4f8e3e960cca4ae281d3fe2f3e4b2c0':
Fix entry handling for 0 length entries.
2014-01-24 18:23:57 +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
c3af60aff5
am c7e28899: am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"
...
* commit 'c7e28899c3917ad6e72d5dc99401bcd133cbd475':
adbd: switch to su domain when running as root
2014-01-24 18:12:03 +00:00
Nick Kralevich
c7e28899c3
am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"
...
* commit '16384312244b8dccd53478a7bdeeb9a492821807':
adbd: switch to su domain when running as root
2014-01-24 18:09:26 +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
7d076b3bf3
am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd
...
* commit 'b36cfdb718f30c667858f8bac04d012366dca94f':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
2014-01-24 00:36:13 +00:00
Colin Cross
b36cfdb718
am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd
...
* commit '4b53b0147a8f1de54a5e89f9763569016150de4f':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
2014-01-24 00:34:47 +00: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
Nick Kralevich
0fef25b764
am 17ff7a8b: am ca53f0a0: don\'t load property_contexts from /data
...
* commit '17ff7a8b28ba736aa9435faba43fc605430d9a0f':
don't load property_contexts from /data
2014-01-23 22:46:51 +00:00
Nick Kralevich
17ff7a8b28
am ca53f0a0: don\'t load property_contexts from /data
...
* commit 'ca53f0a0840ef859dbabfb089f2036656d1ca18c':
don't load property_contexts from /data
2014-01-23 21:40:58 +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
f95d880fe7
am 884116c8: am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"
...
* commit '884116c84aecd9d6685398e2735d6422909bb104':
Attempt to fix Mac build
2014-01-18 23:54:03 +00:00
Christopher Ferris
884116c84a
am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"
...
* commit '719b0198a324582cbf2c01236bb03746475a52e0':
Attempt to fix Mac build
2014-01-18 23:52:11 +00: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
eb665350d1
am 55537633: am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""
...
* commit '555376331f436fb519c182677c22d8299ead5523':
Fix "adb push /sdcard/filename"
2014-01-18 01:12:08 +00:00
Nick Kralevich
555376331f
am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""
...
* commit '78af6c4c946fec01b232c92d40eb6fd202490e3e':
Fix "adb push /sdcard/filename"
2014-01-18 01:08:47 +00: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
1571dac49f
am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
...
* commit '1b37794b07212ef32c2930937445f9cad212ac63':
Fix 'r' for LP64.
2014-01-17 19:26:17 +00:00
Christopher Ferris
758c8636c6
am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
...
* commit '6ecdff5baeb8102438c7f91cd2297b8feaaa5081':
Add PROT_* constants not found on windows.
2014-01-17 19:26:16 +00:00
Christopher Ferris
47fa90641e
am 0cf5d96c: am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
...
* commit '0cf5d96c43a11e150941202961bcedcbce9bb294':
Rewrite libbacktrace to be all C++.
2014-01-17 19:26:16 +00:00
Elliott Hughes
1b37794b07
am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
...
* commit 'f62b602f452ab9e1f97be2a61f3c26ece12506db':
Fix 'r' for LP64.
2014-01-17 19:22:59 +00:00
Christopher Ferris
6ecdff5bae
am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
...
* commit 'f7adcfc8bdd855e424b9970da444843920d8dde5':
Add PROT_* constants not found on windows.
2014-01-17 19:22:59 +00:00
Christopher Ferris
0cf5d96c43
am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
...
* commit '237fdb4a95aeb94ad040a737c6fa22d84d05d633':
Rewrite libbacktrace to be all C++.
2014-01-17 19:22:58 +00:00