Yohann Roussel
5e50b34221
Clean call-jack and its callers
...
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
Change-Id: I28b5f7176747853ef707b8d4055017bf60296641
2015-07-03 11:58:38 +02:00
Evgenii Stepanov
0031c646c8
am ff57fb45
: am be8dd615
: am 473dfdf7
: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
...
* commit 'ff57fb45c727a1b74a84011213d72c935f59a2d5':
Move sanitized vendor libraries to /data/vendor/lib(|64).
2015-06-30 22:17:08 +00:00
Evgenii Stepanov
ff57fb45c7
am be8dd615
: am 473dfdf7
: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
...
* commit 'be8dd6154b021b78422df44c4a7841899cc24866':
Move sanitized vendor libraries to /data/vendor/lib(|64).
2015-06-30 22:02:47 +00:00
Evgenii Stepanov
be8dd6154b
am 473dfdf7
: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
...
* commit '473dfdf71b984fb04ae8f60b8941d89ef5c76710':
Move sanitized vendor libraries to /data/vendor/lib(|64).
2015-06-30 21:48:40 +00:00
Evgenii Stepanov
473dfdf71b
Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
2015-06-30 21:30:29 +00:00
Evgenii Stepanov
bf140974b2
Move sanitized vendor libraries to /data/vendor/lib(|64).
...
Sanitized RPATH now mentions /system/vendor/lib to preserve overlay
in the case when a sanitized version of a vendor library can not be
built.
Bug: 22199458
Change-Id: I3222d2e1d6c08fdd1e0404fcb7db347aa4a92bb7
2015-06-30 14:04:45 -07:00
Tao Bao
541200792b
am f40a34fd
: Merge "Retry adjusting the size computation for reserved blocks."
...
* commit 'f40a34fd23e737b14067308700b3eef27e42d3b1':
Retry adjusting the size computation for reserved blocks.
2015-06-30 19:31:09 +00:00
Tao Bao
4e66343b2b
Retry adjusting the size computation for reserved blocks.
...
Due to the change in https://lwn.net/Articles/546473/ , kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.
[1]: commit efbb5d2e69
.
Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit c7a6f1e4f8
)
2015-06-30 12:17:28 -07:00
Tao Bao
ac15484cfa
am ed959977
: resolved conflicts for merge of c7a6f1e4
to mnc-dev-plus-aosp
...
* commit 'ed959977240f6002ccd342659650782a9fdf7ce7':
Retry adjusting the size computation for reserved blocks.
2015-06-30 17:23:34 +00:00
Tao Bao
ed95997724
resolved conflicts for merge of c7a6f1e4
to mnc-dev-plus-aosp
...
Change-Id: I3201c1d7f9e8b451614259c2fec70c07ae9c8332
2015-06-30 09:33:12 -07:00
Tao Bao
c7a6f1e4f8
Retry adjusting the size computation for reserved blocks.
...
Due to the change in https://lwn.net/Articles/546473/ , kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.
[1]: commit efbb5d2e69
.
Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00
Tao Bao
616b112eeb
am bdf7d94a
: am 2384d01c
: Revert "Adjust the size computation for reserved blocks"
...
* commit 'bdf7d94aacaa604841a385e6d8a0055cfeba4f04':
Revert "Adjust the size computation for reserved blocks"
2015-06-29 21:12:07 +00:00
Tao Bao
bdf7d94aac
am 2384d01c
: Revert "Adjust the size computation for reserved blocks"
...
* commit '2384d01c1c4c5b259840ec526ec8f5ec18cd8087':
Revert "Adjust the size computation for reserved blocks"
2015-06-29 20:56:34 +00:00
Tao Bao
2384d01c1c
Revert "Adjust the size computation for reserved blocks"
...
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.
This reverts commit efbb5d2e69
.
Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Dianne Hackborn
543aeac3fa
am c3db771c
: am 578a9efd
: Merge "Raise API level to 23." into mnc-dev
...
* commit 'c3db771cac9a2d448f4f624ac410377c30fc6158':
Raise API level to 23.
2015-06-27 00:58:12 +00:00
Dianne Hackborn
c3db771cac
am 578a9efd
: Merge "Raise API level to 23." into mnc-dev
...
* commit '578a9efd837896a0abcd49b5152f106fb55f4608':
Raise API level to 23.
2015-06-27 00:50:21 +00:00
Dianne Hackborn
a42551685f
Raise API level to 23.
...
Now apps can target both MNC and 23.
Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00
Evgenii Stepanov
3744231168
am c7db16b6
: am ab6bbbbc
: am c8f97acc
: Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries."
...
* commit 'c7db16b68fbd91f69ec1a7a6a285744b45871002':
SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
2015-06-26 21:39:47 +00:00
Evgenii Stepanov
c7db16b68f
am ab6bbbbc
: am c8f97acc
: Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries."
...
* commit 'ab6bbbbc462852edc8bcf39dd6c26e8f1f4784de':
SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
2015-06-26 21:27:11 +00:00
Evgenii Stepanov
ab6bbbbc46
am c8f97acc
: Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries."
...
* commit 'c8f97acc633efe819d4343d7e9bfcb582a69baea':
SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
2015-06-26 21:11:09 +00:00
Ying Wang
052b6240ac
am 274be72a
: am 742f5832
: Raise progaurd library to platform libraries even for "current" SDK.
...
* commit '274be72a7af43f123bd6bca2b9d004b17f691a67':
Raise progaurd library to platform libraries even for "current" SDK.
2015-06-26 20:15:23 +00:00
Ying Wang
274be72a7a
am 742f5832
: Raise progaurd library to platform libraries even for "current" SDK.
...
* commit '742f5832b16328372d47ae062b3ab946ff37b6f6':
Raise progaurd library to platform libraries even for "current" SDK.
2015-06-26 20:06:22 +00:00
Ying Wang
742f5832b1
Raise progaurd library to platform libraries even for "current" SDK.
...
Without this change, if an app with "LOCAL_SDK_VERSION := current" links
against a static library that uses removed APIs, the app will fail
ProGuard processing because the removed APIs can't be found in the
current SDK. This works around the issue.
Bug: 18510449
Bug: 20667396
Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
2015-06-26 19:37:28 +00:00
Evgenii Stepanov
5adfcb166e
SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
...
These symbols are defined in the ASan runtime library, which is always
present at runtime.
Bug:21785137
Change-Id: Ib8418c66323fd4cdfdc05548048f32380cb84ee5
2015-06-25 17:34:44 -07:00
Mohamad Ayyash
aae1a0ba48
resolved conflicts for merge of 1a4658cd
to mnc-dev
2015-06-25 17:24:05 -07:00
Ying Wang
81c2297e44
am f6bb95b7
: am 48f68478
: am 8f180b90
: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
...
* commit 'f6bb95b7a918925f2a82f8c51fd5624721043b3b':
Create userdata.img with real data when SANITIZE_TARGET=address.
2015-06-25 22:08:25 +00:00
Ying Wang
f6bb95b7a9
am 48f68478
: am 8f180b90
: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
...
* commit '48f68478bd2a375886f30c01b63920575739d9db':
Create userdata.img with real data when SANITIZE_TARGET=address.
2015-06-25 21:54:52 +00:00
Ying Wang
48f68478bd
am 8f180b90
: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
...
* commit '8f180b904f6e03fdec75b3f5cc22b8226e4985ad':
Create userdata.img with real data when SANITIZE_TARGET=address.
2015-06-25 21:41:00 +00:00
Ying Wang
8f180b904f
Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
2015-06-25 21:29:52 +00:00
Ying Wang
2a04839aec
Create userdata.img with real data when SANITIZE_TARGET=address.
...
Bug: 21785137
Change-Id: Ie0c36988759fe07419ad29bab5a71cdd0d992d2a
2015-06-25 14:29:04 -07:00
Mohamad Ayyash
01f9cb7b92
am 6f79df6c
: resolved conflicts for merge of af094912
to mnc-dev-plus-aosp
...
* commit '6f79df6ced19d603819c3623df12acab06135c29':
Add img2simg in host and ota packages
2015-06-25 19:29:08 +00:00
Mohamad Ayyash
6f79df6ced
resolved conflicts for merge of af094912
to mnc-dev-plus-aosp
2015-06-25 12:13:56 -07:00
Mohamad Ayyash
af094912eb
am 19cfe7db
: Merge "Add img2simg in host and ota packages"
...
* commit '19cfe7db4ce414ce36c973fe90e94afa898194d6':
Add img2simg in host and ota packages
2015-06-25 18:56:45 +00:00
Mohamad Ayyash
19cfe7db4c
Merge "Add img2simg in host and ota packages"
2015-06-25 18:44:03 +00:00
Simon Wilson
daf5a88e8b
am 5e14d576
: am b7b7aede
: Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
...
* commit '5e14d576587711c60157ff5cad3619a86623d8bd':
Add compressor options for squashfs system images
2015-06-25 00:33:01 +00:00
Mohamad Ayyash
abc700a19a
am 5ee38170
: am 914811a9
: Merge "Add img2simg in host and ota packages" into mnc-dev
...
* commit '5ee381704fbf9ed6482385e559d05d6ee89a8f54':
Add img2simg in host and ota packages
2015-06-25 00:32:59 +00:00
Mohamad Ayyash
1a4658cd3b
resolved conflicts for merge of ef5dc90b
to lmp-mr1-ub-dev
2015-06-24 16:54:12 -07:00
Simon Wilson
5e14d57658
am b7b7aede
: Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
...
* commit 'b7b7aedeb3c960890e3842ec8e729dbd10077ae4':
Add compressor options for squashfs system images
2015-06-24 23:42:29 +00:00
Mohamad Ayyash
5ee381704f
am 914811a9
: Merge "Add img2simg in host and ota packages" into mnc-dev
...
* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
Add img2simg in host and ota packages
2015-06-24 23:42:27 +00:00
Simon Wilson
b7b7aedeb3
Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
2015-06-24 23:14:07 +00:00
Mohamad Ayyash
914811a9f2
Merge "Add img2simg in host and ota packages" into mnc-dev
2015-06-24 23:13:51 +00:00
Mohamad Ayyash
ef5dc90bba
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-06-24 16:13:07 -07:00
Mohamad Ayyash
9764892031
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-06-24 16:08:15 -07:00
Simon Wilson
6d5ddc32ab
resolved conflicts for merge of ecfc97f7
to mnc-dev
...
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash
353265b081
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-06-24 23:01:27 +00:00
Simon Wilson
ecfc97f772
resolved conflicts for merge of f86e7eea
to lmp-mr1-ub-dev
...
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Adam Powell
1c21ab5265
am f874dbb0
: am 30638322
: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
...
* commit 'f874dbb012d25b93a73e9058b9da1a2509766345':
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
2015-06-24 21:08:21 +00:00
Adam Powell
f874dbb012
am 30638322
: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
...
* commit '30638322e7728c193a0d462bd809065500443558':
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
2015-06-24 20:55:43 +00:00
Adam Powell
30638322e7
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
2015-06-24 20:32:15 +00:00
Adam Powell
0cf80f3ab8
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
...
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
2015-06-24 13:04:22 -07:00