Commit Graph

23911 Commits

Author SHA1 Message Date
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
Tao Bao 8adebf62f8 am ca8fb0f2: am c9fcdae2: Merge "Fix the error in sparse_img.py"
* commit 'ca8fb0f21f3b4b91d60e0678b512f59167d79fda':
  Fix the error in sparse_img.py
2015-06-24 02:01:11 +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
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 7102f57781 Merge "Adjust the size computation for reserved blocks" into mnc-dev 2015-06-24 00:53:17 +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
Tao Bao 2b4ff174ff Fix the error in sparse_img.py
Bug: 22046423
Change-Id: I9c257002c405277557974fadfe27942c38c3cd04
2015-06-23 17:36:10 -07: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 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
Tao Bao 44dbba98b8 am bebd3cfb: Use fstab in the source build
* commit 'bebd3cfbf934beb18b73a4d4e98b98c2c0a1d6fe':
  Use fstab in the source build
2015-06-23 20:46:04 +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
Ying Wang 83aca79b8d Merge "Don't include static executables when SANITIZE_TARGET=address" 2015-06-23 19:59:56 +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 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 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
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 232a195a68 am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
* commit 'dc175a0fa8641552696b25a59f99f58942b7c2d3':
  Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:00:39 +00: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
Tao Bao bebd3cfbf9 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: Idb5c72d1a792e8bb40376a380e3dc06136b13652
2015-06-22 19:27:59 -07: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 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 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 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 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
David Srbecky cddf1ff279 am 1fe4d1ad: Merge "Pass --no-generate-debug-info to dex2oat." into mnc-dev
* commit '1fe4d1ad7992128bbf7276c4749c05713fc0d37c':
  Pass --no-generate-debug-info to dex2oat.
2015-06-19 19:54:59 +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
Evgenii Stepanov cffed61d2f am d479a7a1: Merge "Enable SANITIZE_TARGET."
* commit 'd479a7a119b02624fe922b04125e053b2d968628':
  Enable SANITIZE_TARGET.
2015-06-19 18:26:43 +00:00
David Srbecky 1fe4d1ad79 Merge "Pass --no-generate-debug-info to dex2oat." into mnc-dev 2015-06-19 18:26:27 +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