tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23793 commits 1 branch 0 tags 119 MiB
Commit graph

23793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tao Bao
4d19bf0fd1 am 94a52c36: am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '94a52c3609c04fa94027597ec29f6382a433594e':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:25:03 +00:00
Simon Wilson
83c0b2425a am 3ea36f4f: am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '3ea36f4fd2861b4e0cc4424db69ab5714a876a9f':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 02:25:02 +00:00
Tao Bao
43bf14d27f am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev 
* commit '8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:18:36 +00:00
Tao Bao
94a52c3609 am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '608d9d2452ba547875691f4df7ba313239177395':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:14:36 +00:00
Simon Wilson
3ea36f4fd2 am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit 'e416a41f3ae1132c0eb53d78d3d6bc60f2f0d052':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 02:07:09 +00:00
Tao Bao
8bd720257e resolved conflicts for merge of 8787cd6d to mnc-dev 
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
 2015-07-01 18:06:33 -07:00
Tao Bao
608d9d2452 am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev 
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
 2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
 2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425 Revert "sparse_img.py: Don't write empty map groups." 
This reverts commit 7f9470cda3.

Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
 2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
 2015-07-01 10:10:31 -07: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
Tao Bao
ce3bf9894b resolved conflicts for merge of 54120079 to mnc-dev-plus-aosp 
Change-Id: I48787655f304079970b2a6e8f61d0c48431994a0
 2015-06-30 14:05:12 -07: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
f40a34fd23 Merge "Retry adjusting the size computation for reserved blocks." 2015-06-30 19:19:41 +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
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
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
Tao Bao
929fbe7d37 am 0f0af20d: am 5df6b5c3: Merge "sparse_img.py: Don\'t write empty map groups." 
* commit '0f0af20d6d4fa7d75f7dd8569f713e68eb0cad46':
  sparse_img.py: Don't write empty map groups.
 2015-06-27 16:58:36 +00:00
Tao Bao
0f0af20d6d am 5df6b5c3: Merge "sparse_img.py: Don\'t write empty map groups." 
* commit '5df6b5c3463bc8715510320beb7833c45371e021':
  sparse_img.py: Don't write empty map groups.
 2015-06-27 16:47:53 +00:00
Tao Bao
5df6b5c346 Merge "sparse_img.py: Don't write empty map groups." 2015-06-27 16:37:40 +00:00
Tao Bao
a89781204e sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
 2015-06-27 09:21:31 -07: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
578a9efd83 Merge "Raise API level to 23." into mnc-dev 2015-06-27 00:29:20 +00:00
Ying Wang
0d62f00951 am 95a7311a: am 78d1cba0: (-s ours) Fix conflict resolving error in ef5dc90bba 
* commit '95a7311ac561fd644b5e67debfeb3e210eba7784':
  Fix conflict resolving error in ef5dc90bba
 2015-06-26 23:35:58 +00:00
Tao Bao
40850ebdf1 am 4c89dc3d: am c94a705f: Merge "Use fstab in the source build" 
* commit '4c89dc3d3e7ca5f83e8f56cef2641fb9ad426f31':
  Use fstab in the source build
 2015-06-26 23:19:49 +00:00
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
4c89dc3d3e am c94a705f: Merge "Use fstab in the source build" 
* commit 'c94a705f445aa7edc2a30b364b59fe8becb02f11':
  Use fstab in the source build
 2015-06-26 23:09:11 +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
Ying Wang
95a7311ac5 am 78d1cba0: (-s ours) Fix conflict resolving error in ef5dc90bba 
* commit '78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4':
  Fix conflict resolving error in ef5dc90bba
 2015-06-26 23:06:46 +00:00
Tao Bao
c94a705f44 Merge "Use fstab in the source build" 2015-06-26 22:57:09 +00:00
Tao Bao
dd77b561e5 Merge "Support SELinux context label when mounting" 2015-06-26 22:56:57 +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
Tao Bao
34b47bf42b Use fstab in the source build 
When generating incremental OTAs, we should use the fstab in the source
build instead of the target one. Similarly for recovery_mount_options.

Bug: 22011892
Change-Id: Ia02584c71af7d47835b1f62e7daa46f27940a545
(cherry picked from commit bebd3cfbf9)
 2015-06-26 15:53:16 -07: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
78d1cba0f4 Fix conflict resolving error in ef5dc90bba 
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
 2015-06-26 14:06:32 -07: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