openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
21,945 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

21945 Commits

Author SHA1 Message Date
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 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
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
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
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 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
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
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 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 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
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 042e851999 Merge "build_image.py: Make sparse squashfs images" 2015-06-24 22:01:00 +00: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
Tao Bao ca8fb0f21f am c9fcdae2: Merge "Fix the error in sparse_img.py" 
* commit 'c9fcdae29dafc998f11ad49fec07d508879b8785':
  Fix the error in sparse_img.py
 2015-06-24 00:59:35 +00:00
Tao Bao c9fcdae29d Merge "Fix the error in sparse_img.py" 2015-06-24 00:50:41 +00:00
Tao Bao 109555753f Fix the error in sparse_img.py 
Bug: 22046423
Change-Id: I0796e14df2b523570f0c485d146273f5e5aa5494
(cherry picked from commit 2b4ff174ff)
 2015-06-23 17:44:48 -07:00
Ying Wang cb544c2507 am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address" 
* commit '83aca79b8df3296e24122f3ed9016f1463edb451':
  Don't include static executables when SANITIZE_TARGET=address
 2015-06-23 20:11:24 +00:00
Ying Wang 83aca79b8d Merge "Don't include static executables when SANITIZE_TARGET=address" 2015-06-23 19:59:56 +00:00
Elliott Hughes 1ea32049c9 am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary."" 
* commit 'b7f56b979bbfe00b67f6f6d573d43bcf607649eb':
  Revert "Hide unwinder symbols in each binary."
 2015-06-23 19:38:36 +00:00
Elliott Hughes b7f56b979b Merge "Revert "Hide unwinder symbols in each binary."" 2015-06-23 19:29:27 +00:00
Bart Sears 61f675bb53 Revert "Hide unwinder symbols in each binary." 
This reverts commit dc30a16ba2.

Change-Id: Ib6af148bcaa3041b3040e525442a39b493852794
 2015-06-23 19:23:13 +00:00
Dan Albert a3fcd0e3d8 am 5e3fcc1e: Merge "Hide unwinder symbols in each binary." 
* commit '5e3fcc1e6c5bbf7e85bd9744f178c529dd6c1d49':
  Hide unwinder symbols in each binary.
 2015-06-23 18:12:43 +00:00
Dan Albert 5e3fcc1e6c Merge "Hide unwinder symbols in each binary." 2015-06-23 18:00:37 +00:00
Ying Wang e6e544e596 Don't include static executables when SANITIZE_TARGET=address 
Also we can't build the ota package without these static executables.

Bug: 21785137
Change-Id: I11b35abebced4b0608378a072ece2ab2dbadeffb
 2015-06-23 10:46:03 -07:00
Ying Wang 3f249ac58f am 82f6383f: Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules" 
* commit '82f6383fa6bcfc060bbe631b8dab570e3691bb88':
  Add variable ANDROID_NO_TEST_CHECK to not build all test modules
 2015-06-23 17:04:31 +00:00
Ying Wang 82f6383fa6 Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules" 2015-06-23 16:57:30 +00:00
Claes Elgemark cd5bee3546 Add variable ANDROID_NO_TEST_CHECK to not build all test modules 
Introduce a way to speed up local builds. Don't build all test
modules if ANDROID_NO_TEST_CHECK is set to true.

On master branch this reduces what is built by more than
300 apps and 50 java libraries. Time for doing this on a
12 core machine running with -j13 is about 10 minutes.

Change-Id: I90feb108695ee60d0dbbf497644f767cc3748215
 2015-06-23 15:49:54 +02:00
Bo Hu dc175a0fa8 am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets" 
* commit '3d81b7d627b5076e8e850fca6233bd071f4f7c42':
  Add android.hardware.ethernet.xml for ranchu targets
 2015-06-23 06:49:02 +00:00
Bo Hu 3d81b7d627 Merge "Add android.hardware.ethernet.xml for ranchu targets" 2015-06-23 06:37:54 +00:00
Dan Albert dc30a16ba2 Hide unwinder symbols in each binary. 
These symbols need to always be resolved for each binary. Making these
symbols hidden means that we will get a build breakage if this doesn't
happen, and should also prevent the situation where one unwinder's
symbols are visible to the other.

Bug: 18471342
Bug: 19958712
Change-Id: Ieff1f10dab254b60ed120410f45998cf75bb5b9b
 2015-06-22 15:54:57 -07:00
Evgenii Stepanov cb093b1cea resolved conflicts for merge of bad5ebb6 to stage-aosp-master 
Change-Id: I6837884a3258f34baaf5a7d9ca6bbd6a3f3e62e5
 2015-06-19 14:22:25 -07:00
Evgenii Stepanov 5f41fc3d4d am eac1f6ed: Merge "With SANITIZE_TARGET, move shared libraries to /data." 
* commit 'eac1f6edbde64e81abd06f0ca32c705751b34ca9':
  With SANITIZE_TARGET, move shared libraries to /data.
 2015-06-19 21:14:19 +00:00
Evgenii Stepanov bad5ebb619 Merge "Clean intermediate files if SANITIZE_TARGET has changed." 2015-06-19 21:05:41 +00:00
Evgenii Stepanov eac1f6edbd Merge "With SANITIZE_TARGET, move shared libraries to /data." 2015-06-19 21:05:31 +00:00
Evgenii Stepanov cffed61d2f am d479a7a1: Merge "Enable SANITIZE_TARGET." 
* commit 'd479a7a119b02624fe922b04125e053b2d968628':
  Enable SANITIZE_TARGET.
 2015-06-19 18:26:43 +00:00
Evgenii Stepanov a36223e7e0 Clean intermediate files if SANITIZE_TARGET has changed. 
Do not clean installed files, only intermediate files. This way, two
consequitive builds first without, then with SANITIZE_TARGET will
produce a frankenbuild with both sets of shared libraries.

Bug: 21785137
Change-Id: I231868b15331be942c783458cf36233c2e7740d3
 2015-06-19 11:15:50 -07:00
Evgenii Stepanov 4d3d4141ae With SANITIZE_TARGET, move shared libraries to /data. 
A fully (or even mostly) asan-instrumented device will have 2 copies of each
shared library, which might not fit on system partition. Moving instrumented
libraries to /data.

Bug: 21785137
Change-Id: I64184261da2eb24a1382c67e4931c34a5a38b3c0
 2015-06-19 11:15:50 -07:00
Evgenii Stepanov d479a7a119 Merge "Enable SANITIZE_TARGET." 2015-06-19 18:15:08 +00:00
Dan Albert cf66a79130 am 4fbb83dd: Merge "Add support for `LOCAL_SANITIZE := integer`." 
* commit '4fbb83dd3b69729fe08e4a18dd13ca536ae7376f':
  Add support for `LOCAL_SANITIZE := integer`.
 2015-06-19 18:03:12 +00:00
Dan Albert 4fbb83dd3b Merge "Add support for `LOCAL_SANITIZE := integer`." 2015-06-19 17:51:11 +00:00