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

11235 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arve Hjønnevåg
e272a538dc am 06850f9c: am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev 
* commit '06850f9ccd9c7668a8ab80bdfea00c1b275b5af9':
  rootdir: Make trusty version readable by dumpstate
 2014-10-20 22:09:27 +00:00
Arve Hjønnevåg
06850f9ccd am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev 
* commit 'b50d0cd53f94b0c654e007464ec32396b0cb1aef':
  rootdir: Make trusty version readable by dumpstate
 2014-10-20 22:04:20 +00:00
Arve Hjønnevåg
b50d0cd53f Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev 2014-10-20 21:53:59 +00:00
Adam Lesinski
76476706ab am 972dfbc8: am a0a7ac03: am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE 
* commit '972dfbc8b43aef5e64d7340f0244f3c601284eba':
  MingW doesn't handle __attribute__((weak)) for Windows PE
 2014-10-20 21:35:03 +00:00
Adam Lesinski
972dfbc8b4 am a0a7ac03: am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE 
* commit 'a0a7ac037dd998168fa56d76e9c27bfda1c6a41e':
  MingW doesn't handle __attribute__((weak)) for Windows PE
 2014-10-20 21:30:38 +00:00
Adam Lesinski
a0a7ac037d am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE 
* commit 'fe963bfd8cf3a240785892f8194debb4e0ebb92d':
  MingW doesn't handle __attribute__((weak)) for Windows PE
 2014-10-20 21:20:40 +00:00
Adam Lesinski
fe963bfd8c 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:14:50 +00:00
Badhri Jagan Sridharan
162f7d797c init: Add support "&&" operator in property triggers 
"&&" operator can now be used to test the validity
of two of more properties.

For example:

on property:test.a=1 && property:test.b=1
    setprop test.c 1

The above stub sets the test.c to 1 only when
both test.a=1 and test.b=1

Change-Id: I72c19f7aa92231372a416193618ee6c7fd368141
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
 2014-10-20 13:05:56 -07: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
6d463a5f41 am 1b338c67: am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH" 
* commit '1b338c6784cfe040a74acb58a6c6902d9cab3d8f':
  adb: Add USB vendor ID for TrekStor GmbH
 2014-10-20 18:44:39 +00:00
JP Abgrall
1b338c6784 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:37 +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
Dmitriy Ivanov
7067ff88ff am 96072977: am 37ef356a: Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-dev 
* commit '96072977ee95964fee355c33474932f03a96771e':
  Remove libsigchain from LD_PRELOADs
 2014-10-20 16:57:13 +00:00
Dmitriy Ivanov
96072977ee am 37ef356a: Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-dev 
* commit '37ef356a8e4577b289ade868900e15c82c0ad57f':
  Remove libsigchain from LD_PRELOADs
 2014-10-20 16:51:08 +00:00
Dmitriy Ivanov
37ef356a8e Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-dev 2014-10-20 16:39:57 +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
Arve Hjønnevåg
7770252a84 rootdir: Make trusty version readable by dumpstate 
Change-Id: I761650d286b454f1fe01a585e7cd6ec769bfc527
 2014-10-16 16:11:37 -07:00
Xavier Ducrohet
6f8c763038 am e88a5273: am 81080625: am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev 
* commit 'e88a5273064cc6d939610ed3050cbab01098f02e':
  Fix windows specific behavior of FileMap
 2014-10-16 19:34:10 +00:00
Xavier Ducrohet
e88a527306 am 81080625: am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev 
* commit '81080625a239ae953ef355974e1da7d50389fbb6':
  Fix windows specific behavior of FileMap
 2014-10-16 19:26:38 +00:00
Xavier Ducrohet
81080625a2 am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev 
* commit '88b463a1c12cccc6738baa51642bf639bd9a6e53':
  Fix windows specific behavior of FileMap
 2014-10-16 19:19:16 +00:00
Xavier Ducrohet
bd3a8c6801 am 8afb7d73: am 66fa33a7: am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive. 
* commit '8afb7d73baa369d0f43d85b1a1894cdd8cd243db':
  Fix toolchain issue for windows build of libziparchive.
 2014-10-16 19:17:21 +00:00
Xavier Ducrohet
88b463a1c1 am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-dev 
* commit '1c77bf4ce5059f3a770418cfa8afed39ee41ab24':
  Fix windows specific behavior of FileMap
 2014-10-16 19:13:46 +00:00
Xavier Ducrohet
8afb7d73ba am 66fa33a7: am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive. 
* commit '66fa33a7adf38e513825d36e98b7cdf2c225d2b4':
  Fix toolchain issue for windows build of libziparchive.
 2014-10-16 19:11:45 +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
66fa33a7ad am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive. 
* commit 'dc7957d9b782a759a4eaa75832dd18c9943c7d0c':
  Fix toolchain issue for windows build of libziparchive.
 2014-10-16 18:59:54 +00:00
Dmitriy Ivanov
976e1b6431 Remove libsigchain from LD_PRELOADs 
Bug: 15345057
Bug: 15426766

(cherry picked from commit c9f9f35efa)

Change-Id: If54e1aeaa1e2abe061ac19666af4f4e058b81df2
 2014-10-16 11:45:16 -07:00
Xavier Ducrohet
dc7957d9b7 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:07 +00:00
Chih-hung Hsieh
aee1405ac8 am 495c1c9d: am 2d241ec8: am 3a387176: Merge "Don\'t build init with clang for now" 
* commit '495c1c9d2f5871f55647acaa3d99d01612867777':
  Don't build init with clang for now
 2014-10-16 16:37:18 +00:00
Chih-hung Hsieh
495c1c9d2f 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:04 +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
d94612b686 am e4f3805b: am 1a27d6ab: am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup truncates buffer 
* commit 'e4f3805b29e455edfb07d22b2130efa2ed05d76f':
  Fix issue #18000467: processgroup truncates buffer
 2014-10-16 00:07:32 +00:00
Dianne Hackborn
e4f3805b29 am 1a27d6ab: am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup truncates buffer 
* commit '1a27d6ab328676bf648da74fe78836e7c1ffc8e2':
  Fix issue #18000467: processgroup truncates buffer
 2014-10-15 23:57:18 +00:00
Dianne Hackborn
1a27d6ab32 am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup truncates buffer 
* commit '6d34343263d890114410fafc85885501eca8d3d6':
  Fix issue #18000467: processgroup truncates buffer
 2014-10-15 23:25:11 +00:00
Dianne Hackborn
6d34343263 am 67f46cb0: Fix issue #18000467: processgroup truncates buffer 
* commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1':
  Fix issue #18000467: processgroup truncates buffer
 2014-10-15 23:15:11 +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
7fc2e82548 am 6ea35520: am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies." 
* commit '6ea35520fd03473e1aac176ecd47d81c673691a7':
  Do not inline rarely used trace function bodies.
 2014-10-15 18:02:08 +00:00
Chih-Hung Hsieh
6ea35520fd 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
79d6ffdd84 am 1d6e7336: am 4f083c61: am a8aad166: Merge "logd: insert order for first entry" 
* commit '1d6e7336b5f11dde61a48bf0d0c88f5fd590370b':
  logd: insert order for first entry
 2014-10-15 00:13:37 +00:00
Mark Salyzyn
1d6e7336b5 am 4f083c61: am a8aad166: Merge "logd: insert order for first entry" 
* commit '4f083c6156cb59eddcb52094da7972f16dde2220':
  logd: insert order for first entry
 2014-10-15 00:07:59 +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
Dianne Hackborn
a2b216d6ae am 008b3350: am 00ffc22c: am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram 
* commit '008b335097972962d850b346da902c78ff17e174':
  Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
 2014-10-14 19:48:07 +00:00