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
Tao Bao
e707a83ec0
am f1554ed9: am 2b4ff174: Fix the error in sparse_img.py
...
* commit 'f1554ed93fb6334d5f2453a5b7959ac007884548':
Fix the error in sparse_img.py
2015-06-24 02:26:29 +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
d833eee0e2
am 8adebf62: am ca8fb0f2: am c9fcdae2: Merge "Fix the error in sparse_img.py"
...
* commit '8adebf62f81cdc2b1cd1bd7df3defcd2318dfc97':
Fix the error in sparse_img.py
2015-06-24 02:13:37 +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
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
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
Tao Bao
4a740d8e3e
am 44dbba98: am bebd3cfb: Use fstab in the source build
...
* commit '44dbba98b8e82f49eac7b9665f06e75af71f6337':
Use fstab in the source build
2015-06-23 20:54:41 +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
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
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
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
61749e2dbc
am 232a195a: am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
...
* commit '232a195a68925fa534a553ca8516a4f41cd9b394':
Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:12:37 +00: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
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