Commit graph

23755 commits

Author SHA1 Message Date
Tao Bao
2b6fd80a8d am a629cdd3: am dd77b561: Merge "Support SELinux context label when mounting"
* commit 'a629cdd39354ebd2a7d741a889713f0b25b650fd':
  Support SELinux context label when mounting
2015-06-26 23:19:46 +00:00
Tao Bao
a629cdd393 am dd77b561: Merge "Support SELinux context label when mounting"
* commit 'dd77b561e5e6da3bb595505af625f69ca9f3943b':
  Support SELinux context label when mounting
2015-06-26 23:09:08 +00:00
Tao Bao
dd77b561e5 Merge "Support SELinux context label when mounting" 2015-06-26 22:56:57 +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
Evgenii Stepanov
c8f97acc63 Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries." 2015-06-26 20:57:47 +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
Qiwen Zhao
336636d594 Merge commit 'aae1a0ba' into mnc-dev-plus-aosp 2015-06-26 07:34:16 -07: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
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
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
Mohamad Ayyash
c11e90125e am ef08174a: am 042e8519: Merge "build_image.py: Make sparse squashfs images"
* commit 'ef08174a93ca0539d0fb0be20082ead4d136c5a0':
  build_image.py: Make sparse squashfs images
2015-06-25 00:45:13 +00:00
Mohamad Ayyash
1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Mohamad Ayyash
7ed6a4731b am 4f177cc6: am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs images
* commit '4f177cc6e9c76ab3234772b463fc4e046b15a273':
  build_image.py: Make sparse squashfs images
2015-06-24 23:42:31 +00:00
Mohamad Ayyash
99811e45d0 am 07a7590f: Merge "build_image.py: Make sparse squashfs images" into mnc-dev
* commit '07a7590f087e4ce7783e0907c9e5c84e18a6481e':
  build_image.py: Make sparse squashfs images
2015-06-24 23:42:30 +00: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
Mohamad Ayyash
4f177cc6e9 am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs images
* commit '48cb24a655b58c3b2147f120223627a357ad6372':
  build_image.py: Make sparse squashfs images
2015-06-24 23:16:18 +00:00
Mohamad Ayyash
07a7590f08 Merge "build_image.py: Make sparse squashfs images" into mnc-dev 2015-06-24 23:15:56 +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
Mohamad Ayyash
48cb24a655 am 648e40e8: build_image.py: Make sparse squashfs images
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
  build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Mohamad Ayyash
869a96a1ca am 4826dee7: am 9ca7fa89: resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
* commit '4826dee78d1e5834aed73b40a11432e2ea5b85a9':
  common.py: Add support for squashfs
2015-06-24 22:51:34 +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
Mohamad Ayyash
4826dee78d am 9ca7fa89: resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
* commit '9ca7fa8993bceb97a6256b60742eeda2f699560b':
  common.py: Add support for squashfs
2015-06-24 22:26:02 +00:00
Mohamad Ayyash
ef08174a93 am 042e8519: Merge "build_image.py: Make sparse squashfs images"
* commit '042e851999a73fd14cd612b9c934ab2b2f308b75':
  build_image.py: Make sparse squashfs images
2015-06-24 22:13:08 +00:00
Mohamad Ayyash
9ca7fa8993 resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev 2015-06-24 15:04:38 -07:00
Mohamad Ayyash
042e851999 Merge "build_image.py: Make sparse squashfs images" 2015-06-24 22:01:00 +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
Mohamad Ayyash
2cd51cc711 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 11:08:00 -07:00
Mohamad Ayyash
648e40e866 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
fa6c8a9b79 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:44:52 -07:00
Michael Wright
b20475db10 am 7371a7a5: Add hid command to base build
* commit '7371a7a5b596f96f8bebf157a7dc261c545a2315':
  Add hid command to base build
2015-06-24 17:13:52 +00:00
Michael Wright
7371a7a5b5 Add hid command to base build
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
2015-06-24 15:55:47 +01:00
Mohamad Ayyash
865369e63b am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit '9ff8a7162b1c6f8d10768537a8e3f45601d8d6da':
  Allow flashing a squashfs system image
2015-06-24 02:13:41 +00:00
Tao Bao
344af6d18c am 7102f577: Merge "Adjust the size computation for reserved blocks" into mnc-dev
* commit '7102f57781a8cde2e450951af3cbd7e60b44dca1':
  Adjust the size computation for reserved blocks
2015-06-24 02:13:40 +00:00
Tao Bao
f1554ed93f am 2b4ff174: Fix the error in sparse_img.py
* commit '2b4ff174ff09d3d4f69897c8f8004c57836975b4':
  Fix the error in sparse_img.py
2015-06-24 02:13:39 +00:00