StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,053 Commits 1 Branch 0 Tags
b62b2945743b688d0d75ee484d76ced34e3ac6ab
Commit Graph

7505 Commits

Author SHA1 Message Date
Mohamad Ayyash
4a82b40106 am 865369e6: am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 
* commit '865369e63b45132ea53295224688daf48404b0f8':
  Allow flashing a squashfs system image
 2015-06-24 02:26:31 +00:00
Tao Bao
83ec85ed18 am 344af6d1: am 7102f577: Merge "Adjust the size computation for reserved blocks" into mnc-dev 
* commit '344af6d18cca2b01428e9c00abc6ad19be5ec002':
  Adjust the size computation for reserved blocks
 2015-06-24 02:26:30 +00: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
Mohamad Ayyash
9ff8a7162b am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
  Allow flashing a squashfs system image
 2015-06-24 01:38:26 +00:00
Mohamad Ayyash
f35ed6bd84 resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 2015-06-23 16:22:32 -07:00
Tao Bao
efbb5d2e69 Adjust 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.

Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
 2015-06-23 14:53:28 -07:00
Ying Wang
60a186e095 am b3ba45c5: am cb544c25: am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address" 
* commit 'b3ba45c5df6ae8ce000aa9602ac1df5fee8b0af5':
  Don't include static executables when SANITIZE_TARGET=address
 2015-06-23 21:03:52 +00:00
Ying Wang
b3ba45c5df am cb544c25: am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address" 
* commit 'cb544c2507cc6caafec61eff67405096868a7bc8':
  Don't include static executables when SANITIZE_TARGET=address
 2015-06-23 20:53:40 +00: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
Elliott Hughes
eae7d846a0 am 547eae2a: am 1ea32049: am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary."" 
* commit '547eae2ac0933246c0fdec90534b0265a3a08c9d':
  Revert "Hide unwinder symbols in each binary."
 2015-06-23 19:58:14 +00:00
Elliott Hughes
547eae2ac0 am 1ea32049: am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary."" 
* commit '1ea32049c9e302dd3b464948609828b53f32e544':
  Revert "Hide unwinder symbols in each binary."
 2015-06-23 19:51:07 +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
b0b32a04b8 am b64370c1: am a3fcd0e3: am 5e3fcc1e: Merge "Hide unwinder symbols in each binary." 
* commit 'b64370c18933d15a1b9412da354e403709b4a468':
  Hide unwinder symbols in each binary.
 2015-06-23 18:41:06 +00:00
Dan Albert
b64370c189 am a3fcd0e3: am 5e3fcc1e: Merge "Hide unwinder symbols in each binary." 
* commit 'a3fcd0e3d832295fada0f3f5a6c0c67af23c004c':
  Hide unwinder symbols in each binary.
 2015-06-23 18:27:34 +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
ab8174daef am e4558976: am 3f249ac5: am 82f6383f: Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules" 
* commit 'e45589760866ec64f4c7a8ab186caa981554313e':
  Add variable ANDROID_NO_TEST_CHECK to not build all test modules
 2015-06-23 17:18:23 +00:00
Ying Wang
f642334f36 Fix cts_testcase_config rule. 
Bug: 21997856
Change-Id: I63af363f215a48430ca98e4968f9d37f40dea52e
 2015-06-23 10:15:00 -07:00
Ying Wang
e455897608 am 3f249ac5: am 82f6383f: Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules" 
* commit '3f249ac58f8d7854850a5c936634389a1ed6e9b0':
  Add variable ANDROID_NO_TEST_CHECK to not build all test modules
 2015-06-23 17:10:24 +00: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
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
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
Simon Wilson
f86e7eeabc Add compressor options for squashfs system images 
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
 2015-06-22 15:42:52 -07:00
leozwang
c177d1cd97 am db95afe9: am 5c91af0d: Merge "Add BUILD NUMBER into oem image." into mnc-dev 
* commit 'db95afe910f7fd60baee9c1bddf0f0502213d532':
  Add BUILD NUMBER into oem image.
 2015-06-22 01:08:12 +00:00
leozwang
db95afe910 am 5c91af0d: Merge "Add BUILD NUMBER into oem image." into mnc-dev 
* commit '5c91af0d9486f82d72d71c8962a64643d1d32f70':
  Add BUILD NUMBER into oem image.
 2015-06-22 00:57:02 +00:00
leozwang
5c91af0d94 Merge "Add BUILD NUMBER into oem image." into mnc-dev 2015-06-22 00:36:06 +00:00
leozwang
92eb5703e5 Add BUILD NUMBER into oem image. 
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
 2015-06-20 21:05:19 -07:00
Evgenii Stepanov
22f7e4b072 am 1703b327: resolved conflicts for merge of cb093b1c to mnc-dev-plus-aosp 
* commit '1703b3273b39acfdc64731bc50eea7c33c796c92':
  Clean intermediate files if SANITIZE_TARGET has changed.
 2015-06-19 22:22:55 +00:00
Evgenii Stepanov
1703b3273b resolved conflicts for merge of cb093b1c to mnc-dev-plus-aosp 
Change-Id: I6281796fe1cc41bd14b3ec10c01a75717c346e39
 2015-06-19 15:01:14 -07:00
Evgenii Stepanov
1fb7bc99fd am a43f213c: am 5f41fc3d: am eac1f6ed: Merge "With SANITIZE_TARGET, move shared libraries to /data." 
* commit 'a43f213c78ae37fc3a4829da99d9900cf18b2f6f':
  With SANITIZE_TARGET, move shared libraries to /data.
 2015-06-19 21:36:08 +00:00
Evgenii Stepanov
a43f213c78 am 5f41fc3d: am eac1f6ed: Merge "With SANITIZE_TARGET, move shared libraries to /data." 
* commit '5f41fc3d4d12cd5d1dd195c7369661e5b516c310':
  With SANITIZE_TARGET, move shared libraries to /data.
 2015-06-19 21:27:42 +00: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
4063e86c5a am 90d53fd3: am cffed61d: am d479a7a1: Merge "Enable SANITIZE_TARGET." 
* commit '90d53fd3e674a88efcf22aec7d9d8d56081171cc':
  Enable SANITIZE_TARGET.
 2015-06-19 18:48:23 +00:00
Evgenii Stepanov
90d53fd3e6 am cffed61d: am d479a7a1: Merge "Enable SANITIZE_TARGET." 
* commit 'cffed61d2f07e3eea7d2e4f7f5fd337115ca4fd6':
  Enable SANITIZE_TARGET.
 2015-06-19 18:36:04 +00:00
Dan Albert
235a7f7ee7 am 6f3527fe: am cf66a791: am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer." 
* commit '6f3527fe604b635e22243905cbe6cd1473374f11':
  Add support for `LOCAL_SANITIZE := integer`.
 2015-06-19 18:29:07 +00:00
Evgenii Stepanov
cffed61d2f am d479a7a1: Merge "Enable SANITIZE_TARGET." 
* commit 'd479a7a119b02624fe922b04125e053b2d968628':
  Enable SANITIZE_TARGET.
 2015-06-19 18:26:43 +00:00
Dan Albert
6f3527fe60 am cf66a791: am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer." 
* commit 'cf66a79130a7382a583f20197f42436a5c1d4095':
  Add support for `LOCAL_SANITIZE := integer`.
 2015-06-19 18:16:24 +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
b8a87c2241 am 630e81ab: am 9b187b35: am 20f4a364: Merge "Cleanup unused clear_vars.mk entry." 
* commit '630e81ab99d546d7f99228bca6e21b1a4f9749e0':
  Cleanup unused clear_vars.mk entry.
 2015-06-19 17:57:06 +00:00
Dan Albert
630e81ab99 am 9b187b35: am 20f4a364: Merge "Cleanup unused clear_vars.mk entry." 
* commit '9b187b35f32f427dbd6af21614dfefa03177b594':
  Cleanup unused clear_vars.mk entry.
 2015-06-19 17:45:07 +00:00
Dan Albert
9b187b35f3 am 20f4a364: Merge "Cleanup unused clear_vars.mk entry." 
* commit '20f4a364a83d9a3906d3cf8b866d00437f8ff2d4':
  Cleanup unused clear_vars.mk entry.
 2015-06-19 17:35:15 +00:00
Dan Albert
abf4bc916a Add support for LOCAL_SANITIZE := integer. 
This also does a bit of cleanup in config_sanitizers.mk. The result is
that `LOCAL_SANITIZE := <any arbitrary ubsan group>` should function
fine for both host and target.

This is a superset of LOCAL_DETECT_INTEGER_OVERFLOWS, so remove that.
This also checks integer division by zero.  It's supposed to cover
shifting undefined behaviors as well, but apparently it does not
(though `LOCAL_SANITIZE := shift` works fine).

Change-Id: I4ac99eafa6920a3f8cb82af37ce56ff0fdb95223
 2015-06-19 10:28:06 -07:00