Ying Wang
95a543c987
Set up environmental variable PATH before calling releasetools scripts.
...
Some releasetools python sripts rely on $PATH to search for the
executables. With this change, you don't need to run lunch even after you
change the build system variable OUT_DIR.
Bug: 19320328
Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8
(cherry picked from commit 9d252e1009
)
2015-03-13 11:36:15 -07:00
Doug Zongker
b2cdb1cca5
include oem.prop files in otatools_package
...
Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95
(cherry picked from commit ce43bc8df2
)
2015-03-13 11:36:15 -07:00
Jesse Zhao
f749b4b664
DO NOT MERGE: Bundle libc++.so into otatools-package.
...
Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
(cherry picked from commit f7daa92cff
)
2015-03-13 11:36:14 -07:00
Doug Zongker
0c6c03269e
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: If14b4afefcc1a20ea19dfca3f3b9f9fae73189a6
(cherry picked from commit f22b0f43ef
)
2015-03-13 11:36:14 -07:00
Michael Runge
910b005f18
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
(cherry picked from commit cad78c12fb
)
2015-03-13 11:36:14 -07:00
Dan Albert
966f887b14
am b3ca410e: am 105b94cc: Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
...
* commit 'b3ca410ead9d656fafb98f9054e39eea2c158f8d':
[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps.
2015-03-13 17:50:05 +00:00
Dan Albert
b3ca410ead
am 105b94cc: Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
...
* commit '105b94cc44dc3cec6df22ac6e80da8dcb3ffd031':
[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps.
2015-03-13 17:42:52 +00:00
P.Y. Laligand
79d000802f
Merge "Add the correct dependency when the full version of the protocol buffer library is requested."
2015-03-13 17:28:43 +00:00
Dan Albert
105b94cc44
Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
2015-03-13 17:27:47 +00:00
Miao Wang
bb5196e857
[Renderscript] making librsjni.so be packed with apks when
...
v8.renderscript is needed, even for bundled apps.
Bug: 19343399
Change-Id: I461e244be15e08d4525439bc042529314c84031e
(cherry picked from commit c919b0ba88
)
2015-03-13 10:23:30 -07:00
Yohann Roussel
c76d99dca1
Redirect jack warnings to stdout
...
Bug: 19715777
Change-Id: If651a35f3579dd6e976eeb8a063b0eefdfaa992a
2015-03-13 17:59:05 +01:00
Sami Tolvanen
d99ede2865
am a76e9b7b: am edb88c94: Merge "Fix the error that free_string is not defined."
...
* commit 'a76e9b7bd8a063a8b103b8f29de300c175b18989':
Fix the error that free_string is not defined.
2015-03-13 11:27:29 +00:00
Sami Tolvanen
751edcf4ca
am 8f9e859a: am 8cdf7206: (-s ours) Merge "Change transfer list format to include block hashes"
...
* commit '8f9e859a16303dc854ff20489406fadbf27d5bba':
Change transfer list format to include block hashes
2015-03-13 11:27:28 +00:00
Sami Tolvanen
a76e9b7bd8
am edb88c94: Merge "Fix the error that free_string is not defined."
...
* commit 'edb88c94fb628a66fdf4e3d1eda844e6bb0b9bf3':
Fix the error that free_string is not defined.
2015-03-13 11:23:17 +00:00
Sami Tolvanen
8f9e859a16
am 8cdf7206: (-s ours) Merge "Change transfer list format to include block hashes"
...
* commit '8cdf72066b1bf5cdb198427bde484ef7238f3390':
Change transfer list format to include block hashes
2015-03-13 11:23:15 +00:00
Sami Tolvanen
edb88c94fb
Merge "Fix the error that free_string is not defined."
2015-03-13 11:02:20 +00:00
Sami Tolvanen
8cdf72066b
Merge "Change transfer list format to include block hashes"
2015-03-13 11:02:02 +00:00
Christopher Ferris
847cc02ff2
am 40bcc3bc: am 62d5e2ac: Merge "Update x86_64 minimal ISA instruction set"
...
* commit '40bcc3bce081cafeaf885c42c9c5332c278ae4ac':
Update x86_64 minimal ISA instruction set
2015-03-13 07:49:42 +00:00
Mathieu Chartier
656b28da09
am 4771ea8f: (-s ours) am cf26fb81: Merge "JIT default opt-in"
...
* commit '4771ea8f56fc2bb59cc4d914a19953786047a120':
JIT default opt-in
2015-03-13 07:49:30 +00:00
Tao Bao
ab9c73c402
am 3de365bb: (-s ours) am ae524f60: am daebaa6e: Restrict the verification in block-based incremental OTAs
...
* commit '3de365bb2f5e39d937722ab049f81a35a2e69b77':
Restrict the verification in block-based incremental OTAs
2015-03-13 07:40:58 +00:00
Ying Wang
1884b406b5
am 0adc3302: am d3d682e3: Merge "Use "rsync -a" to copy over to "
...
* commit '0adc3302a60e817d81abd0f955a20e9a4e789037':
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
2015-03-13 06:32:55 +00:00
Christopher Ferris
40bcc3bce0
am 62d5e2ac: Merge "Update x86_64 minimal ISA instruction set"
...
* commit '62d5e2acf5b189c5b7dfda530db690af8c607809':
Update x86_64 minimal ISA instruction set
2015-03-13 04:26:30 +00:00
Christopher Ferris
62d5e2acf5
Merge "Update x86_64 minimal ISA instruction set"
2015-03-13 04:18:18 +00:00
Ying Wang
08b32584f4
am 4e32ac83: am dedff62c: Merge "Contain obj of ../ source files in their intermediate dir."
...
* commit '4e32ac834299da0c5892e9fb15777ca2cd335492':
Contain obj of ../ source files in their intermediate dir.
2015-03-13 02:59:09 +00:00
Ying Wang
fa8bcffa5a
am 28d74436: am fe593edd: Merge "Build only 64-bit odex for system server jars."
...
* commit '28d74436e1b36ca5c5a5265bc1759fa7183fc09c':
Build only 64-bit odex for system server jars.
2015-03-13 02:59:08 +00:00
Mathieu Chartier
4771ea8f56
am cf26fb81: Merge "JIT default opt-in"
...
* commit 'cf26fb819da63fee37d4c8070f213b404a0b7fe7':
JIT default opt-in
2015-03-13 01:35:57 +00:00
Mathieu Chartier
0694eabe4d
JIT default opt-in
...
Bug: 17950037
(cherry picked from commit 2a2a03046e
)
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 18:27:54 -07:00
Mathieu Chartier
cf26fb819d
Merge "JIT default opt-in"
2015-03-13 01:24:33 +00:00
Tao Bao
3de365bb2f
am ae524f60: am daebaa6e: Restrict the verification in block-based incremental OTAs
...
* commit 'ae524f60bce085971480f27a6b75db13ad970c11':
Restrict the verification in block-based incremental OTAs
2015-03-12 23:08:54 +00:00
Tao Bao
ae524f60bc
am daebaa6e: Restrict the verification in block-based incremental OTAs
...
* commit 'daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
Restrict the verification in block-based incremental OTAs
2015-03-12 22:56:28 +00:00
Mathieu Chartier
2a2a03046e
JIT default opt-in
...
Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 14:45:22 -07:00
Ying Wang
84f62c3ad3
resolved conflicts for merge of 828e92d6
to master
...
Change-Id: Idc9b059f840f328e86e3972882ccef6d5ee4e1d9
2015-03-12 14:36:29 -07:00
Tao Bao
daebaa6ed3
Restrict the verification in block-based incremental OTAs
...
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.
Change-Id: I3a776495b69e1d174fcb01b10e40c0e912914fd8
2015-03-12 13:47:04 -07:00
Ying Wang
209108298f
am 0aef0966: am fafe5ac8: Merge "Signapk.java: hide the password"
...
* commit '0aef09668e04b1de2ab86291c5f734a5dc718891':
Signapk.java: hide the password
2015-03-12 15:35:56 +00:00
Ying Wang
25c894bf70
am ec447f36: am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."
...
* commit 'ec447f368a0622781a0b6f95d422d30f480a24b5':
Support .asm being compiled by yasm targeted for x86_64.
2015-03-12 15:35:53 +00:00
Ying Wang
ab27f6e775
am b396517c: am 501af528: Merge "Increase system and userdata partition sizes."
...
* commit 'b396517cb25ca85d1c17b4d4e09be87cdf8256b4':
Increase system and userdata partition sizes.
2015-03-12 15:35:51 +00:00
Mingwei Shi
357778de34
Update x86_64 minimal ISA instruction set
...
Change-Id: I3ca7f8a0799e6aef09ab1dfb719d218c7338ebf8
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
2015-03-12 22:45:27 +08:00
Ying Wang
0adc3302a6
am d3d682e3: Merge "Use "rsync -a" to copy over to "
...
* commit 'd3d682e3751f6418ea5519a484542e687c44addb':
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
2015-03-12 01:00:09 +00:00
Ying Wang
d3d682e375
Merge "Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)"
2015-03-11 23:57:07 +00:00
Ying Wang
437e43b555
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
...
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.
Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
2015-03-11 16:55:33 -07:00
Ying Wang
83a1934085
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
...
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.
Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
2015-03-11 16:48:01 -07:00
Ying Wang
4e32ac8342
am dedff62c: Merge "Contain obj of ../ source files in their intermediate dir."
...
* commit 'dedff62c8e44320dec8f667e27fdcd4cdff1430d':
Contain obj of ../ source files in their intermediate dir.
2015-03-11 20:59:44 +00:00
Ying Wang
28d74436e1
am fe593edd: Merge "Build only 64-bit odex for system server jars."
...
* commit 'fe593edd5377f5046ef07d2efa53670451bd13a4':
Build only 64-bit odex for system server jars.
2015-03-11 20:59:43 +00:00
Ying Wang
dedff62c8e
Merge "Contain obj of ../ source files in their intermediate dir."
2015-03-11 20:43:41 +00:00
Ying Wang
fe593edd53
Merge "Build only 64-bit odex for system server jars."
2015-03-11 20:43:32 +00:00
Ying Wang
828e92d67a
am a2ad467f: Merge "Support modules to be installed directly to recovery.img"
...
* commit 'a2ad467f7a82511901625aa8dd8253c19df87a1c':
Support modules to be installed directly to recovery.img
2015-03-11 17:57:02 +00:00
Ying Wang
a2ad467f7a
Merge "Support modules to be installed directly to recovery.img"
2015-03-11 17:40:54 +00:00
Ying Wang
f25838a7ea
Support modules to be installed directly to recovery.img
...
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.
Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-11 10:38:13 -07:00
Jesse Zhao
7b985f6aed
Fix the error that free_string is not defined.
...
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:19573713
(cherry picked from commit 7ca20d1a1c
)
2015-03-11 17:22:43 +00:00
Sami Tolvanen
dd67a295cc
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
(cherry picked from commit cac671a9d1
)
2015-03-11 17:22:06 +00:00