ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10887 commits 1 branch 0 tags 217 MiB
Commit graph

10887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Rogers
8dac3559dd am b968d5c8: Merge "Add shared library version of libziparchive." 
* commit 'b968d5c8468c9b0707f88f773fae16074e9018cf':
  Add shared library version of libziparchive.
 2014-10-30 18:08:17 +00:00
Ian Rogers
b968d5c846 Merge "Add shared library version of libziparchive." 2014-10-30 18:05:55 +00:00
Ian Rogers
40ac96c72c Add shared library version of libziparchive. 
Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
 2014-10-30 09:53:38 -07:00
Aristidis Papaioannou
ffb60ce6b3 am 91b76d7d: Merge "Made suffix length of rotated logcat files constant." 
* commit '91b76d7de3029f6e617d640ca1b9ef844fa44477':
  Made suffix length of rotated logcat files constant.
 2014-10-29 15:33:34 +00:00
Aristidis Papaioannou
91b76d7de3 Merge "Made suffix length of rotated logcat files constant." 2014-10-29 15:28:52 +00:00
Aristidis Papaioannou
eba7344fc1 Made suffix length of rotated logcat files constant. 
The suffix now uses as many digits as needed to cover the maximum number
of rotated files.

eg, for 20 files it would use 2 digits: log_file.{01,02,03,...,20}

Change-Id: I4709b3cf4bf88c209db3c4d9e24a3a4731c98bae
 2014-10-29 15:00:54 +00:00
Calin Juravle
7a1abfe3b5 am 64989126: Merge "Add code cache tests to libnativebridge." 
* commit '649891267f3b0db1c6c37152fc570a4824d6aa39':
  Add code cache tests to libnativebridge.
 2014-10-29 12:32:21 +00:00
Narayan Kamath
182f33db82 am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge." 
* commit '8cf2ce1064847d5fed0ec728ef6e916e238767c0':
  Don't allow SUPPORTED_ABIs to be set by the native bridge.
 2014-10-28 19:28:30 +00:00
Calin Juravle
4de4e6defc resolved conflicts for merge of e3c22c41 to stage-aosp-master 
Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
 2014-10-28 19:09:50 +00:00
Calin Juravle
649891267f Merge "Add code cache tests to libnativebridge." 2014-10-28 16:06:15 +00:00
Calin Juravle
59a719c466 Add code cache tests to libnativebridge. 
Bug: 18027433
Change-Id: Ie5369c0d5bd147af412174dc0753d8a314196643
 2014-10-28 16:02:38 +00:00
Chih-Hung Hsieh
845867b2c2 am d88323b2: Merge "Add volatile to avoid clang optimization." 
* commit 'd88323b2667c443c2738eb601eb0b9eaad1c3049':
  Add volatile to avoid clang optimization.
 2014-10-28 04:49:12 +00:00
Chih-Hung Hsieh
a2853bd1e6 am 5bea7edd: Merge "Fix type cast error, should be char* not void*." 
* commit '5bea7edddd1bca0f94b08f3fb7aefab1c3021e17':
  Fix type cast error, should be char* not void*.
 2014-10-28 04:47:08 +00:00
Narayan Kamath
8cf2ce1064 Merge "Don't allow SUPPORTED_ABIs to be set by the native bridge." 2014-10-27 16:16:02 +00:00
Calin Juravle
e3c22c416f Merge "Handle code_cache dir creation in libnativebridge" 2014-10-27 15:15:39 +00:00
Calin Juravle
f9d9e2a2d9 Handle code_cache dir creation in libnativebridge 
Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
 2014-10-27 15:03:13 +00:00
Chih-Hung Hsieh
d88323b266 Merge "Add volatile to avoid clang optimization." 2014-10-24 03:03:20 +00:00
Chih-Hung Hsieh
a1ff475b07 Add volatile to avoid clang optimization. 
BUG: 18108178
Change-Id: Ie5b8b1808fcf6d1eacc14a7c6ac0c8d49641fec2
 2014-10-23 16:50:51 -07:00
Chih-Hung Hsieh
5bea7edddd Merge "Fix type cast error, should be char* not void*." 2014-10-23 22:59:03 +00:00
Chih-Hung Hsieh
dc61d77872 Fix type cast error, should be char* not void*. 
BUG: 18106835
Change-Id: Ic0051d5035e5684de0091cd3528d65e1b1e57161
 2014-10-23 15:25:28 -07:00
Narayan Kamath
dd22aeff73 Don't allow SUPPORTED_ABIs to be set by the native bridge. 
SUPPORTED_ABIs is a prioritized list of all ABIs a device
support, and must not vary depending on whether or not an app
is emulated.

bug: 18061712

(cherry picked from commit 66f0d93c26)

Change-Id: I99cea3a56228dac43ae310c295881881e5a77c31
 2014-10-22 18:56:32 +01:00
Bill Yi
aad358fbc1 Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEAD 2014-10-22 08:49:05 -07:00
Nick Kralevich
37d70f5367 am c0b4b8b0: Merge "Ensure /data/adb exists" 
* commit 'c0b4b8b0f17efd4381a828bfbed232fb10b27300':
  Ensure /data/adb exists
 2014-10-21 17:06:32 +00:00
Nick Kralevich
c0b4b8b0f1 Merge "Ensure /data/adb exists" 2014-10-21 17:01:40 +00:00
Nick Kralevich
89252ce31a Ensure /data/adb exists 
Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.

Bug: https://code.google.com/p/android/issues/detail?id=72895
Change-Id: I9cee2a0202417ff72a5ede7742e25877f51732dd
 2014-10-21 16:16:39 +00:00
Adam Lesinski
b2042f7263 am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE 
* commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2':
  MingW doesn't handle __attribute__((weak)) for Windows PE
 2014-10-20 21:15:53 +00:00
Adam Lesinski
a1ac84cd8d MingW doesn't handle __attribute__((weak)) for Windows PE 
Windows PE format doesn't have the same support for weak symbols
as ELF does.

The symbol android_log_id_to_name was strangely omitted from the
resulting Windows executable and the callsite where it was supposed
to be called was relaced with a different symbol, which caused a crash
in AAPT on Windows.

This change works due to a careful set of #ifdefs that ensure only one
definition of android_log_id_to_name is defined, but there are other
uses of __attribute__((weak)) which should be inspected.

Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
 2014-10-20 12:33:59 -07:00
JP Abgrall
cb3739b545 am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH" 
* commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3':
  adb: Add USB vendor ID for TrekStor GmbH
 2014-10-20 18:38:24 +00:00
JP Abgrall
7e38ab476f am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH" 
* commit '951c48c504b28cd1646560a73d670493722f68f0':
  adb: Add USB vendor ID for TrekStor GmbH
 2014-10-20 18:33:35 +00:00
JP Abgrall
951c48c504 Merge "adb: Add USB vendor ID for TrekStor GmbH" 2014-10-20 18:11:10 +00:00
Thorsten Koroscha
4fa99e542f adb: Add USB vendor ID for TrekStor GmbH 
Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9
Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
 2014-10-20 10:26:20 +02:00
Xavier Ducrohet
d82db1581b am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev 
* commit '1c77bf4ce5059f3a770418cfa8afed39ee41ab24':
  Fix windows specific behavior of FileMap
 2014-10-16 19:12:48 +00:00
Xavier Ducrohet
1c77bf4ce5 Merge "Fix windows specific behavior of FileMap" into lmp-dev 2014-10-16 19:09:40 +00:00
Xavier Ducrohet
1a55aa5e34 Fix windows specific behavior of FileMap 
The implementation of the FileMap destructor would
close the file, only on Windows, which did not match
the behavior on mac/linux.

This is because calling munmap does not close the file
descriptor. It must be closed separately, before or after
munmap.

On Windows, the file must also be closed manually,
before or after closing the mappingFile.

The change basically removes the closing file from
the windows-specific part of the destructor, to
make behavior more consistent on all platforms
where the caller to FileMap is responsible for closing
its own file (since FileMap receives an opened file).

Change-Id: I5e3cfffbb870d5f3595802ccac57dbc1dbf1ce6e
 2014-10-16 12:09:06 -07:00
Xavier Ducrohet
0c7ad123ca am cd1da4e0: Fix toolchain issue for windows build of libziparchive. 
* commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1':
  Fix toolchain issue for windows build of libziparchive.
 2014-10-16 16:55:08 +00:00
Chih-hung Hsieh
5d727710ba am 2d241ec8: am 3a387176: Merge "Don\'t build init with clang for now" 
* commit '2d241ec8a86c56bbf8522eb007674d7b4e3d164d':
  Don't build init with clang for now
 2014-10-16 16:32:17 +00:00
Chih-hung Hsieh
2d241ec8a8 am 3a387176: Merge "Don\'t build init with clang for now" 
* commit '3a3871769130428bc1b8f3de03be7231750e1b82':
  Don't build init with clang for now
 2014-10-16 16:27:07 +00:00
Chih-hung Hsieh
3a38717691 Merge "Don't build init with clang for now" 2014-10-16 16:22:03 +00:00
Xavier Ducrohet
cd1da4e04f Fix toolchain issue for windows build of libziparchive. 
With mingw 4.8, the new default packed behavior is broken and makes
zip archive fails due to unexpected misalignment in
CentralDirectoryRecord.

This patch uses -mno-ms-bitfields to revert to the old packed
behavior.

Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
 2014-10-16 07:49:16 +00:00
Dianne Hackborn
0f773c83cb am 67f46cb0: Fix issue #18000467: processgroup truncates buffer 
* commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1':
  Fix issue #18000467: processgroup truncates buffer
 2014-10-15 19:22:09 +00:00
Dianne Hackborn
67f46cb0e1 Fix issue #18000467: processgroup truncates buffer 
Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
 2014-10-15 11:36:28 -07:00
Chih-Hung Hsieh
c37387a4cd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies." 
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
 2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
07f1300c4c am 7979f1ce: Merge "Do not inline rarely used trace function bodies." 
* commit '7979f1ce5fd771aa9814ef7390f290201ae0790d':
  Do not inline rarely used trace function bodies.
 2014-10-15 17:54:19 +00:00
Chih-Hung Hsieh
7979f1ce5f Merge "Do not inline rarely used trace function bodies." 2014-10-15 17:49:03 +00:00
Mark Salyzyn
40d5a79f98 am 4f083c61: am a8aad166: Merge "logd: insert order for first entry" 
* commit '4f083c6156cb59eddcb52094da7972f16dde2220':
  logd: insert order for first entry
 2014-10-15 00:08:16 +00:00
Mark Salyzyn
4f083c6156 am a8aad166: Merge "logd: insert order for first entry" 
* commit 'a8aad1667ff191cbc3972c40e8f9ec960db4ef96':
  logd: insert order for first entry
 2014-10-15 00:01:39 +00:00
Mark Salyzyn
a8aad1667f Merge "logd: insert order for first entry" 2014-10-14 23:57:33 +00:00
Mark Salyzyn
eae155e1ce logd: insert order for first entry 
Change-Id: I39e8e6d32407a1796a0c3a121f9dc4dc5402c3df
 2014-10-14 23:57:13 +00:00
Chih-Hung Hsieh
2d3150e736 Do not inline rarely used trace function bodies. 
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.

BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
 2014-10-14 15:37:20 -07:00
Dmitriy Ivanov
1e2bec489c resolved conflicts for merge of 3f95c89d to lmp-dev-plus-aosp 
Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f
 2014-10-14 10:50:59 -07:00