Mathieu Chartier
68f6e30521
am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
...
* commit '9682e56a794f2fc68cae00475b7f11927c57b3da':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 16:51:34 +00:00
Mathieu Chartier
9682e56a79
Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
2015-03-19 16:44:56 +00:00
Mathieu Chartier
8b11285dd9
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
Bug: 19735273
This reverts commit 3abfcfc17b .
Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:06:28 -07:00
Mathieu Chartier
d7f3d8ba74
am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
* commit '8ca542f4394affd420271d8df946e199449508e6':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:32:51 +00:00
Christopher Ferris
8081a8b596
am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
...
* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:32:50 +00:00
Elliott Hughes
475846579e
am 0f98a378: Merge "Remove netcfg from the list of base modules."
...
* commit '0f98a3781c4fab57bdd696cca3edd6614d65abe6':
Remove netcfg from the list of base modules.
2015-03-17 14:32:48 +00:00
Mathieu Chartier
8ca542f439
Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-17 02:04:42 +00:00
Christopher Ferris
13169ccba2
Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
2015-03-17 01:31:16 +00:00
Christopher Ferris
f123057f5e
Revert "Switch x86 and x86_64 build to use GCC 4.9"
...
This reverts commit 533c7aa6a2 .
Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
2015-03-17 01:29:51 +00:00
Elliott Hughes
0f98a3781c
Merge "Remove netcfg from the list of base modules."
2015-03-17 00:58:29 +00:00
Andrew Hsieh
81f7dee74c
am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
...
* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
Switch x86 and x86_64 build to use GCC 4.9
2015-03-16 23:59:04 +00:00
Andrew Hsieh
bf0b6df4c1
Merge "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-16 23:50:19 +00:00
Mathieu Chartier
3abfcfc17b
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
...
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Elliott Hughes
f3124b3523
Remove netcfg from the list of base modules.
...
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.
Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
2015-03-16 13:52:30 -07:00
Ying Wang
efc3a22009
am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
...
* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:01:59 +00:00
Ying Wang
d73696c1fe
Merge "Load cts/build/config.mk after build/core/config.mk"
2015-03-16 18:57:37 +00:00
Ying Wang
f738b3bb9f
Load cts/build/config.mk after build/core/config.mk
...
So that the cts config.mk can use global variables set by the core build
system config.mk.
Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008 )
2015-03-16 10:56:03 -07:00
Andrew Hsieh
533c7aa6a2
Switch x86 and x86_64 build to use GCC 4.9
...
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
2015-03-16 13:17:59 +08:00
Tao Bao
6502ae93e1
am 18b27966: Merge "Restrict the verification in block-based incremental OTAs"
...
* commit '18b27966a66a27da7b7199ab3e4351e9369cf060':
Restrict the verification in block-based incremental OTAs
2015-03-14 05:08:38 +00:00
Tao Bao
18b27966a6
Merge "Restrict the verification in block-based incremental OTAs"
2015-03-14 05:01:34 +00:00
Tao Bao
dd2a5892e5
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: Ic630346eab2a993a84d0aeaacd7167ef62cc24f6
(cherry picked from commit daebaa6ed3 )
2015-03-13 17:57:15 -07: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
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
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
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
62d5e2acf5
Merge "Update x86_64 minimal ISA instruction set"
2015-03-13 04:18:18 +00:00
Mathieu Chartier
cf26fb819d
Merge "JIT default opt-in"
2015-03-13 01:24:33 +00:00
Mathieu Chartier
2a2a03046e
JIT default opt-in
...
Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 14:45:22 -07:00