Dan Albert
4d45d6d8b0
am b478d625
: am 9db3e6c6
: Merge "Support "LOCAL_FDO_SUPPORT := always"."
...
* commit 'b478d625f2f72440f239ec538fae167ede45f49e':
Support "LOCAL_FDO_SUPPORT := always".
2015-03-13 23:29:03 +00:00
Dan Albert
169f16f808
am fd496a64
: am c70805ee
: Merge "Set up environmental variable PATH before calling releasetools scripts."
...
* commit 'fd496a64277e331487048acee586da6ad5d02870':
Set up environmental variable PATH before calling releasetools scripts.
2015-03-13 23:29:02 +00:00
Dan Albert
ba64cebf14
am 7c4a3464
: am fcd0d98b
: Merge "include oem.prop files in otatools_package"
...
* commit '7c4a34642aecebb35845345cc86dfe63c86936f5':
include oem.prop files in otatools_package
2015-03-13 23:29:00 +00:00
Dan Albert
c37d7043e6
am 3ad14218
: Merge "Strip prebuilt shared library by default."
...
* commit '3ad14218ccca2c729dfd90a24050e40fc52a56bf':
Strip prebuilt shared library by default.
2015-03-13 23:21:25 +00:00
Dan Albert
e685e849c0
am 8de543fd
: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
...
* commit '8de543fdec61cae9eef8e3b3f7a0e5cc4cd0aa70':
Switch NDK libraries to 4.9 for x86_64 and mips64
2015-03-13 23:21:24 +00:00
Dan Albert
b478d625f2
am 9db3e6c6
: Merge "Support "LOCAL_FDO_SUPPORT := always"."
...
* commit '9db3e6c61fe10073a2ed829f1036bc6281767202':
Support "LOCAL_FDO_SUPPORT := always".
2015-03-13 23:21:23 +00:00
Dan Albert
fd496a6427
am c70805ee
: Merge "Set up environmental variable PATH before calling releasetools scripts."
...
* commit 'c70805eef5be3e10003518d24adb083dcd1efbc2':
Set up environmental variable PATH before calling releasetools scripts.
2015-03-13 23:21:21 +00:00
Dan Albert
7c4a34642a
am fcd0d98b
: Merge "include oem.prop files in otatools_package"
...
* commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc':
include oem.prop files in otatools_package
2015-03-13 23:21:20 +00:00
Dan Albert
3ad14218cc
Merge "Strip prebuilt shared library by default."
2015-03-13 23:18:47 +00:00
Dan Albert
8de543fdec
Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
2015-03-13 23:18:25 +00:00
Dan Albert
9db3e6c61f
Merge "Support "LOCAL_FDO_SUPPORT := always"."
2015-03-13 23:17:52 +00:00
Dan Albert
c70805eef5
Merge "Set up environmental variable PATH before calling releasetools scripts."
2015-03-13 23:17:26 +00:00
Dan Albert
fcd0d98b6c
Merge "include oem.prop files in otatools_package"
2015-03-13 23:17:02 +00:00
Dan Albert
8337bd0659
am eed58605
: (-s ours) am ebb611f8
: (-s ours) am 137b049a
: (-s ours) Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
...
* commit 'eed58605ae180d080e5bd1576e1744ed89d578d9':
2015-03-13 21:54:52 +00:00
Dan Albert
a16e32ef23
am c856bcb9
: am 4cdf1357
: Merge "add otatools-package target"
...
* commit 'c856bcb9c8dbc09849436d138239850eddfcbeab':
2015-03-13 21:54:52 +00:00
Dan Albert
20130098c7
resolved conflicts for merge of c856bcb9
to master
...
Change-Id: I51bc60f9f795a78f07c345cfea433635c8f88dbb
2015-03-13 14:51:18 -07:00
Dan Albert
bd46502942
am 8a8da96f
: am cb9ace32
: (-s ours) Merge "Do not use block_verify on target-files where feature is missing."
...
* commit '8a8da96fb4f107e3f7330c8f4d9576b38ae9ca69':
Do not use block_verify on target-files where feature is missing.
2015-03-13 21:16:37 +00:00
Dan Albert
eed58605ae
am ebb611f8
: (-s ours) am 137b049a
: (-s ours) Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
...
* commit 'ebb611f8d3911434072611cb0e48302fc9ed1226':
DO NOT MERGE: Bundle libc++.so into otatools-package.
2015-03-13 21:10:50 +00:00
Dan Albert
c856bcb9c8
am 4cdf1357
: Merge "add otatools-package target"
...
* commit '4cdf1357433b407b350517779248e2194c88c3f4':
add otatools-package target
2015-03-13 21:10:49 +00:00
Dan Albert
8a8da96fb4
am cb9ace32
: (-s ours) Merge "Do not use block_verify on target-files where feature is missing."
...
* commit 'cb9ace32d4cdfd84d6da98f70fd4041350abcf2c':
Do not use block_verify on target-files where feature is missing.
2015-03-13 21:10:48 +00:00
Dan Albert
ebb611f8d3
am 137b049a
: (-s ours) Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
...
* commit '137b049aef6ffc1de1340657ecf9208303ec1872':
DO NOT MERGE: Bundle libc++.so into otatools-package.
2015-03-13 20:47:55 +00:00
Dan Albert
137b049aef
Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
2015-03-13 20:44:09 +00:00
Dan Albert
4cdf135743
Merge "add otatools-package target"
2015-03-13 20:32:59 +00:00
Dan Albert
cb9ace32d4
Merge "Do not use block_verify on target-files where feature is missing."
2015-03-13 20:31:41 +00:00
Ying Wang
c1729f3602
Strip prebuilt shared library by default.
...
Strip prebuilt shared library but not try adding gnu debuglink.
It would fail if you try run the adding gnu debuglink command if a
prebuilt is already stripped.
Bug: 17177288
Change-Id: If5811865715c2437e45fbd329983ef1212ef0109
(cherry picked from commit bfb52a2ec1
)
2015-03-13 11:36:15 -07:00
Przemyslaw Szczepaniak
0e2d00ff1f
Switch NDK libraries to 4.9 for x86_64 and mips64
...
Android NDK r10b doesn't even provide 4.8 for those
archs.
Change-Id: I10840c6c7bbc0dd9028a794162d021d8b3e6b19a
(cherry picked from commit fabd383bc8
)
2015-03-13 11:36:15 -07:00
Ying Wang
d791463511
Support "LOCAL_FDO_SUPPORT := always".
...
"LOCAL_FDO_SUPPORT := always" enables FDO without user specifying
"BUILD_FDO_OPTIMIZE := true", i.e. it turns on FDO for a
module in any build configuration.
Change-Id: I05d8db2edb2b3f5db073fa14d5bf1083a04571c0
(cherry picked from commit 45d0143ab1
)
2015-03-13 11:36:15 -07:00
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