OSDN Git Service
Christopher Ferris [Wed, 25 Mar 2015 18:28:53 +0000 (18:28 +0000)]
Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
Christopher Ferris [Wed, 25 Mar 2015 18:27:21 +0000 (18:27 +0000)]
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
This reverts commit
6fb735b07132b613de1b5b64c5c31a36c4b9ac2d.
Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
Ying Wang [Wed, 25 Mar 2015 18:11:54 +0000 (18:11 +0000)]
Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
Dan Albert [Tue, 24 Mar 2015 00:07:01 +0000 (00:07 +0000)]
Merge "Run ZipFile.testzip() during zipfile tests."
Dan Albert [Mon, 23 Mar 2015 23:54:39 +0000 (16:54 -0700)]
Run ZipFile.testzip() during zipfile tests.
This still doesn't catch the issue that [1] fixes, but it's probably a
good idea anyway.
[1]: https://android-review.googlesource.com/#/c/143469/
Change-Id: Iaa607ec7450d605b26114bd81ea41a14c6613c0e
Tao Bao [Mon, 23 Mar 2015 23:48:59 +0000 (23:48 +0000)]
Merge "Fix the computation of basefilename"
Tao Bao [Mon, 23 Mar 2015 23:01:17 +0000 (16:01 -0700)]
Fix the computation of basefilename
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
Greg Hackmann [Mon, 23 Mar 2015 21:49:31 +0000 (21:49 +0000)]
Merge "Allow system images larger than 2GiB, pt. 2"
Greg Hackmann [Mon, 23 Mar 2015 21:05:50 +0000 (14:05 -0700)]
Allow system images larger than 2GiB, pt. 2
We need to patch zipfile during close() too, because it refers to the
ZIP64 file size threshold when writing out the central directory
Bug:
18015246
Bug:
19888174
Change-Id: I1b49d653d0831fcc2106808f86c929d7a2b22ff3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Tao Bao [Mon, 23 Mar 2015 03:29:58 +0000 (03:29 +0000)]
Merge "Fix the syntax error in the edify script generator"
Tao Bao [Sun, 22 Mar 2015 21:20:48 +0000 (14:20 -0700)]
Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.
Bug:
19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
Brian Carlstrom [Fri, 20 Mar 2015 21:52:38 +0000 (21:52 +0000)]
Merge "Clearly explain that 32-bit x86 is not supported"
Mathieu Chartier [Fri, 20 Mar 2015 21:19:40 +0000 (21:19 +0000)]
Merge "Change eng builds from interpret-only to verify-at-runtime"
Paul Miller [Fri, 20 Mar 2015 21:08:49 +0000 (21:08 +0000)]
Merge "Revert "Replace legacy Browser with BookmarkProvider""
Ying Wang [Fri, 20 Mar 2015 20:29:52 +0000 (20:29 +0000)]
Merge "Bump generic_arm64 system partition size."
Ying Wang [Fri, 20 Mar 2015 20:29:10 +0000 (13:29 -0700)]
Bump generic_arm64 system partition size.
Change-Id: Ic53fdaa0143ee2c0cce5a2f750da4c52adc6fdb9
Brian Carlstrom [Fri, 20 Mar 2015 18:39:00 +0000 (11:39 -0700)]
Clearly explain that 32-bit x86 is not supported
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
Mathieu Chartier [Thu, 19 Mar 2015 17:34:23 +0000 (10:34 -0700)]
Change eng builds from interpret-only to verify-at-runtime
Faster dex2oat -> faster boot after syncing core libraries.
Bug:
19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
Paul Miller [Fri, 20 Mar 2015 16:26:26 +0000 (16:26 +0000)]
Revert "Replace legacy Browser with BookmarkProvider"
This reverts commit
61690224177c7ff4c95fa3b163fd7b9c4c82c4a3.
Change-Id: I0246ef7a89de08bc449509b39f8db8279ea0871e
BUG:
19351071
Ying Wang [Fri, 20 Mar 2015 16:20:00 +0000 (16:20 +0000)]
Merge "Bump generic_mips system partition size."
Ying Wang [Fri, 20 Mar 2015 16:18:33 +0000 (09:18 -0700)]
Bump generic_mips system partition size.
Change-Id: Ieb3becc3ddc1efa19c6e6d34b4a31c0440d3479d
Alexander Ivchenko [Fri, 20 Mar 2015 14:07:34 +0000 (17:07 +0300)]
Switch x86 and x86_64 to 4.9. Attempt #2.
BUG=
16407835
Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
Narayan Kamath [Fri, 20 Mar 2015 08:53:08 +0000 (08:53 +0000)]
Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
Tao Bao [Fri, 20 Mar 2015 03:09:41 +0000 (03:09 +0000)]
Merge "Make the generated OTAs repeatable"
Dan Albert [Fri, 20 Mar 2015 03:04:19 +0000 (03:04 +0000)]
Merge "Static binaries with libc++ need libs c, m and dl."
Tao Bao [Fri, 20 Mar 2015 02:42:12 +0000 (19:42 -0700)]
Make the generated OTAs repeatable
The generated OTAs are supposed to be repeatable. The use of dict in
blockimgdiff.py breaks the assumption for block-based OTAs. Fixed by
using OrderedDict instead.
Change-Id: I945bdc879912ba174ca330c152b1f8fc7ed211ac
Tao Bao [Thu, 19 Mar 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Allow system images larger than 2GiB."
Dan Albert [Tue, 27 Jan 2015 23:53:15 +0000 (15:53 -0800)]
Allow system images larger than 2GiB.
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
The bug (b/
19364241) in original commit has been fixed.
Bug:
18015246
Bug:
19364241
Bug:
19839468
(cherry picked from commit
cd082d4bfe917b2e6b97436839cbbbc67c733c83)
Change-Id: I7b5cc310e0a9ba894533b53cb998afd5ce96d8c6
Paul Miller [Thu, 19 Mar 2015 20:23:22 +0000 (20:23 +0000)]
Merge "Replace legacy Browser with BookmarkProvider"
Dan Albert [Thu, 19 Mar 2015 20:05:13 +0000 (13:05 -0700)]
Static binaries with libc++ need libs c, m and dl.
Can't be done on the user's end because these libraries all need to be
linked after libc++_static.
Change-Id: Ib21364e6f43689cf59da31d6f561919731ef8272
Narayan Kamath [Fri, 13 Mar 2015 17:16:07 +0000 (17:16 +0000)]
Remove VoiceDialer from PRODUCT_PACKAGE list.
Change-Id: Ibc86ddee90a9ff83c3cdcbf086a6a1e466ba5088
Mathieu Chartier [Thu, 19 Mar 2015 16:44:55 +0000 (16:44 +0000)]
Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
Mathieu Chartier [Thu, 19 Mar 2015 01:52:40 +0000 (18:52 -0700)]
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Bug:
19735273
This reverts commit
3abfcfc17b022a5af9d37403f81fae027ab850b9.
Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
Paul Miller [Wed, 18 Mar 2015 22:26:15 +0000 (15:26 -0700)]
Replace legacy Browser with BookmarkProvider
BookmarkProvider is Browser's old provider code, refactored into its
own app.
BUG:
19351071
Change-Id: I0a5e1f2fc54749e2d3e3442636a26b2459b600c6
Mathieu Chartier [Tue, 17 Mar 2015 02:04:41 +0000 (02:04 +0000)]
Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Christopher Ferris [Tue, 17 Mar 2015 01:31:16 +0000 (01:31 +0000)]
Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
Christopher Ferris [Tue, 17 Mar 2015 01:29:51 +0000 (01:29 +0000)]
Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit
533c7aa6a293659541222f0dd89bee044ba71a2a.
Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
Elliott Hughes [Tue, 17 Mar 2015 00:58:29 +0000 (00:58 +0000)]
Merge "Remove netcfg from the list of base modules."
Andrew Hsieh [Mon, 16 Mar 2015 23:50:18 +0000 (23:50 +0000)]
Merge "Switch x86 and x86_64 build to use GCC 4.9"
Mathieu Chartier [Mon, 16 Mar 2015 23:14:56 +0000 (16:14 -0700)]
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug:
19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
Elliott Hughes [Mon, 16 Mar 2015 20:52:30 +0000 (13:52 -0700)]
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
Ying Wang [Mon, 16 Mar 2015 18:57:37 +0000 (18:57 +0000)]
Merge "Load cts/build/config.mk after build/core/config.mk"
Ying Wang [Fri, 13 Feb 2015 18:28:40 +0000 (10:28 -0800)]
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
bacf5f8008e4361d810895dd251354ac348cbf27)
Andrew Hsieh [Fri, 13 Jun 2014 20:16:13 +0000 (13:16 -0700)]
Switch x86 and x86_64 build to use GCC 4.9
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
Tao Bao [Sat, 14 Mar 2015 05:01:33 +0000 (05:01 +0000)]
Merge "Restrict the verification in block-based incremental OTAs"
Tao Bao [Thu, 12 Mar 2015 19:32:37 +0000 (12:32 -0700)]
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
daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9)
Dan Albert [Fri, 13 Mar 2015 23:18:46 +0000 (23:18 +0000)]
Merge "Strip prebuilt shared library by default."
Dan Albert [Fri, 13 Mar 2015 23:18:25 +0000 (23:18 +0000)]
Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
Dan Albert [Fri, 13 Mar 2015 23:17:51 +0000 (23:17 +0000)]
Merge "Support "LOCAL_FDO_SUPPORT := always"."
Dan Albert [Fri, 13 Mar 2015 23:17:25 +0000 (23:17 +0000)]
Merge "Set up environmental variable PATH before calling releasetools scripts."
Dan Albert [Fri, 13 Mar 2015 23:17:01 +0000 (23:17 +0000)]
Merge "include oem.prop files in otatools_package"
Dan Albert [Fri, 13 Mar 2015 20:44:08 +0000 (20:44 +0000)]
Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
Dan Albert [Fri, 13 Mar 2015 20:32:58 +0000 (20:32 +0000)]
Merge "add otatools-package target"
Dan Albert [Fri, 13 Mar 2015 20:31:40 +0000 (20:31 +0000)]
Merge "Do not use block_verify on target-files where feature is missing."
Ying Wang [Thu, 21 Aug 2014 00:12:32 +0000 (17:12 -0700)]
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
bfb52a2ec199a75e1a0e4e92148af0a6323c9f46)
Przemyslaw Szczepaniak [Tue, 16 Sep 2014 14:17:47 +0000 (15:17 +0100)]
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
fabd383bc876ff803a3565ccedd9b61559bf5127)
Ying Wang [Tue, 28 Oct 2014 21:50:59 +0000 (14:50 -0700)]
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
45d0143ab1155ff33c3ad63ca19a64d7f69086f4)
Ying Wang [Tue, 10 Feb 2015 01:20:06 +0000 (17:20 -0800)]
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
9d252e10096d4f730f39662e81489e4a13752d29)
Doug Zongker [Mon, 25 Aug 2014 15:08:26 +0000 (08:08 -0700)]
include oem.prop files in otatools_package
Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95
(cherry picked from commit
ce43bc8df2fae960eb02e56a55d365e7c18a1fc1)
Jesse Zhao [Wed, 10 Dec 2014 18:52:50 +0000 (10:52 -0800)]
DO NOT MERGE: Bundle libc++.so into otatools-package.
Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
(cherry picked from commit
f7daa92cff1de4a03616b0851f303830bee0de0b)
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
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
f22b0f43efbc16c548692dc239a387edda15d78f)
Michael Runge [Thu, 12 Feb 2015 03:28:08 +0000 (19:28 -0800)]
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
cad78c12fbb44b6030bcc80823c010e65b9c3f37)
Dan Albert [Fri, 13 Mar 2015 17:27:45 +0000 (17:27 +0000)]
Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
Miao Wang [Fri, 13 Feb 2015 00:22:59 +0000 (16:22 -0800)]
[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
c919b0ba88c0a7ce4b8722b4e3befbc81a652422)
Sami Tolvanen [Fri, 13 Mar 2015 11:02:19 +0000 (11:02 +0000)]
Merge "Fix the error that free_string is not defined."
Sami Tolvanen [Fri, 13 Mar 2015 11:02:02 +0000 (11:02 +0000)]
Merge "Change transfer list format to include block hashes"
Christopher Ferris [Fri, 13 Mar 2015 04:18:17 +0000 (04:18 +0000)]
Merge "Update x86_64 minimal ISA instruction set"
Mathieu Chartier [Fri, 13 Mar 2015 01:24:32 +0000 (01:24 +0000)]
Merge "JIT default opt-in"
Mathieu Chartier [Thu, 12 Mar 2015 01:45:47 +0000 (18:45 -0700)]
JIT default opt-in
Bug:
17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
Mingwei Shi [Mon, 9 Mar 2015 11:44:49 +0000 (19:44 +0800)]
Update x86_64 minimal ISA instruction set
Change-Id: I3ca7f8a0799e6aef09ab1dfb719d218c7338ebf8
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Ying Wang [Wed, 11 Mar 2015 23:57:07 +0000 (23:57 +0000)]
Merge "Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)"
Ying Wang [Wed, 11 Mar 2015 23:44:12 +0000 (16:44 -0700)]
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
Ying Wang [Wed, 11 Mar 2015 20:43:40 +0000 (20:43 +0000)]
Merge "Contain obj of ../ source files in their intermediate dir."
Ying Wang [Wed, 11 Mar 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Build only 64-bit odex for system server jars."
Ying Wang [Wed, 11 Mar 2015 17:40:54 +0000 (17:40 +0000)]
Merge "Support modules to be installed directly to recovery.img"
Ying Wang [Tue, 10 Mar 2015 19:02:57 +0000 (12:02 -0700)]
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
Jesse Zhao [Tue, 3 Mar 2015 00:53:08 +0000 (16:53 -0800)]
Fix the error that free_string is not defined.
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:
19573713
(cherry picked from commit
7ca20d1a1c422dddbdca97c7927cfadd6c38dc68)
Sami Tolvanen [Tue, 9 Dec 2014 16:40:34 +0000 (16:40 +0000)]
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
cac671a9d175039ecbfe3cd84fe10b183aab1f8a)
Ying Wang [Wed, 11 Mar 2015 16:45:59 +0000 (16:45 +0000)]
Merge "Signapk.java: hide the password"
Ying Wang [Wed, 11 Mar 2015 16:37:25 +0000 (16:37 +0000)]
Merge "Support .asm being compiled by yasm targeted for x86_64."
Ying Wang [Wed, 11 Mar 2015 16:37:08 +0000 (16:37 +0000)]
Merge "Increase system and userdata partition sizes."
Douglas Leung [Tue, 10 Mar 2015 23:09:19 +0000 (16:09 -0700)]
Increase system and userdata partition sizes.
The extra system space is needed for mips64r6/mips32r6 quick
mode images and the extra userdata is needed to run ART tests.
Change-Id: I96dc1553d950dcf046b57feff10a369e9155bd4d
Ying Wang [Wed, 11 Mar 2015 01:03:11 +0000 (18:03 -0700)]
Contain obj of ../ source files in their intermediate dir.
Previously when a file in LOCAL_SRC_FILES starts with "../", the object
file may escape out of the module's intermediate directory, because we
insert the source file's path (but not with LOCAL_PATH) to the object
file's path. Even worse when two object files escape to the same destination
and cause conflict.
This change fixes the issue by removing the "../" inside the object
files' paths. To do that, we have to set up the compilation rules for
those files one by one, instead of using the one-for-all static
pattern rules.
Bug:
19641115
Change-Id: I19f3c48ece3244fa14acb2caa609deea710840d3
Ying Wang [Tue, 10 Mar 2015 00:17:51 +0000 (17:17 -0700)]
Build only 64-bit odex for system server jars.
By default we build both 64-bit and 32-bit odex files for a Java library.
With this change:
- For system server jars (PRODUCT_SYSTEM_SERVER_JARS), we build only
64-bit odex;
- A library can opt to build only 64-bit odex with
"LOCAL_MULTILIB := first".
Bug:
19650934
Change-Id: Ic0b7fd381396ed276e6129f883881c5c41c6e154
Ying Wang [Tue, 10 Mar 2015 01:57:40 +0000 (18:57 -0700)]
Support .asm being compiled by yasm targeted for x86_64.
Change-Id: Ia6425c38dd2f7ad2dc697213cd61b7515b9e7aff
Christopher Ferris [Sat, 7 Mar 2015 17:09:20 +0000 (17:09 +0000)]
am
708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
* commit '
708b56edc879847f418108cf360bc990bb2a502a':
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
Christopher Ferris [Fri, 6 Mar 2015 21:27:47 +0000 (21:27 +0000)]
Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
Andreas Gampe [Fri, 6 Mar 2015 19:16:47 +0000 (19:16 +0000)]
am
9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
* commit '
9a0382ffe64ad8ccecc15141779627a882f31ee0':
Build: Fail preopting apps when there are verifier errors
Andreas Gampe [Fri, 6 Mar 2015 19:12:08 +0000 (19:12 +0000)]
Merge "Build: Fail preopting apps when there are verifier errors"
Christopher Ferris [Fri, 6 Mar 2015 18:19:12 +0000 (10:19 -0800)]
Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
On non-arm architectures, there is no TARGET_CPU_VARIANT set. For x86,
art assumes that the CPU variant is actually the TARGET_ARCH_VARIANT.
Therefore, if no TARGET_CPU_VARIANT is set, use the TARGET_ARCH_VARIANT.
If TARGET_ARCH_VARIANT is not set, then use default as the value.
Change-Id: I17fc9e3ac7412462103b8f0b287fce106298b741
Andreas Gampe [Fri, 6 Mar 2015 03:18:18 +0000 (19:18 -0800)]
Build: Fail preopting apps when there are verifier errors
Expectation is that classes in pre-compiled apps should be structurally
sound and not cause a hard failure.
Bug:
19606409
Change-Id: Idc9da4d4c6bd259555671c657d3414a97940717f
Chih-Hung Hsieh [Fri, 6 Mar 2015 01:02:27 +0000 (01:02 +0000)]
am
9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
* commit '
9575e13aa71248b1ded3e07849a4a7523e76d639':
Filter out unsupported flag: -fprefetch-loop-arrays
Chih-Hung Hsieh [Fri, 6 Mar 2015 00:48:52 +0000 (00:48 +0000)]
Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
Chih-Hung Hsieh [Fri, 6 Mar 2015 00:02:04 +0000 (16:02 -0800)]
Filter out unsupported flag: -fprefetch-loop-arrays
Change-Id: I55ba9045948a910ebd76c09f9f4ebb6b37eed1e7
Ying Wang [Thu, 5 Mar 2015 20:05:17 +0000 (20:05 +0000)]
am
71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
* commit '
71c64dc1033aed7de0ebb215fc35d09e7fcd9db0':
Reorder lib paths in transform-bc-to-so to avoid build race condition.
Ying Wang [Thu, 5 Mar 2015 20:00:32 +0000 (20:00 +0000)]
Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
Ying Wang [Thu, 5 Mar 2015 19:29:30 +0000 (11:29 -0800)]
Reorder lib paths in transform-bc-to-so to avoid build race condition.
We should put the NDK library path before
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), so that we link against the NDK
libc/libm, instead of the platform libc/libm in
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), which may still being written out,
because we don't have dependency on them.
Bug:
19613709
Change-Id: I26a8b272e38b7436bca3324246b21cd71349662b
Mohamad Ayyash [Wed, 4 Mar 2015 23:43:45 +0000 (15:43 -0800)]
resolved conflicts for merge of
fc759204 to stage-aosp-master
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
Mohamad Ayyash [Wed, 4 Mar 2015 22:55:21 +0000 (22:55 +0000)]
Merge "Allow flashing a squashfs system image"
Dan Albert [Wed, 4 Mar 2015 06:23:10 +0000 (06:23 +0000)]
am
ccf1cc55: Merge "Fix the mac build."
* commit '
ccf1cc55a4448dc43302624da07d3211356473e2':
Fix the mac build.