Commit Graph

6417 Commits

Author SHA1 Message Date
Christopher Ferris 07aa4c1fee am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit 'a45223b63566d8496250ae797778a4d16ee81419':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:50:10 +00:00
Ying Wang 5a8f70678b am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
* commit 'e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0':
  Switch x86 and x86_64 to 4.9. Attempt #2.
2015-03-25 18:50:07 +00:00
Christopher Ferris a45223b635 Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2."" 2015-03-25 18:28:53 +00:00
Christopher Ferris c9d2952e1e Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
This reverts commit 6fb735b071.

Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
2015-03-25 18:27:21 +00:00
Ying Wang e9b15e2ccd Merge "Switch x86 and x86_64 to 4.9. Attempt #2." 2015-03-25 18:11:54 +00:00
Bernhard Rosenkränzer a24a9a8e62 Allow -mcpu=cortex-a15 for clang
Clang 3.6 (including the snapshot present in AOSP) added support for
-mcpu=cortex-a15 -- there's no need to fall back to generic armv7-a
anymore.

Change-Id: I8a582261ac35e32f8f1def1d244cf83f2096520d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2015-03-25 16:59:46 +01:00
Per Astrand cab6699160 MKBOOTIMG override were missing in two places
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.

Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.

Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
2015-03-25 16:02:50 +01:00
Ying Wang c85af62429 am 743b9f49: am ad54a4da: Add selinux and verity support to custom image generation.
* commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
  Add selinux and verity support to custom image generation.
2015-03-23 18:02:30 +00:00
Ying Wang ad54a4dab5 Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE

Also changed the staging directory name to the mount point, like we do
for other images built by the build system.

Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit 7d51a40295)
2015-03-23 17:50:16 +00:00
The Android Automerger 91fbe4de46 "LKY80" 2015-03-21 06:05:46 -07:00
Brian Carlstrom 3ba88e7d2d am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
* commit 'b7fe2e622d7a6a696749d5441358b84569de6f75':
  Clearly explain that 32-bit x86 is not supported
2015-03-20 22:09:36 +00:00
Brian Carlstrom b7fe2e622d am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
* commit 'f7683b813a7f71313f3dd1f71be1a8ef9d800ebf':
  Clearly explain that 32-bit x86 is not supported
2015-03-20 22:02:49 +00:00
Mathieu Chartier 783a632f45 am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '7f91420487936d7916577e163d4f38a4534bb76d':
  Change eng builds from interpret-only to verify-at-runtime
2015-03-20 21:58:48 +00:00
Brian Carlstrom f7683b813a Merge "Clearly explain that 32-bit x86 is not supported" 2015-03-20 21:52:38 +00:00
Mathieu Chartier 7f91420487 am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '55fbc49fe1993d87a6a978132c827f316f2be5a7':
  Change eng builds from interpret-only to verify-at-runtime
2015-03-20 21:26:39 +00:00
Mathieu Chartier 55fbc49fe1 Merge "Change eng builds from interpret-only to verify-at-runtime" 2015-03-20 21:19:40 +00:00
Brian Carlstrom 2cd8a74b2d Clearly explain that 32-bit x86 is not supported
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
2015-03-20 12:50:42 -07:00
Mathieu Chartier 62a7cac50d Change eng builds from interpret-only to verify-at-runtime
Faster dex2oat -> faster boot after syncing core libraries.

Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
2015-03-20 11:15:20 -07:00
Alexander Ivchenko 6fb735b071 Switch x86 and x86_64 to 4.9. Attempt #2.
BUG=16407835

Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2015-03-20 17:07:34 +03:00
Dan Albert ad3f2ee0df am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."
* commit 'f1999c8af022d295397d2c1079dbebf362d9ad37':
  Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:23:48 +00:00
Dan Albert f1999c8af0 am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."
* commit '59112a2da30004b20c186e0878148cd6053ae859':
  Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:14:17 +00:00
Dan Albert 59112a2da3 Merge "Static binaries with libc++ need libs c, m and dl." 2015-03-20 03:04:20 +00:00
Dan Albert 7955bf0fd6 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
2015-03-19 13:05:13 -07:00
Mathieu Chartier b01a4ca3c8 am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
* commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 16:59:02 +00:00
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 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
Richard Uhler 820fe32d46 Store odex files in oat/<isa>/ directory.
Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding change in platform/art and
platform/frameworks/native.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
2015-03-18 12:41:31 -07:00
Mathieu Chartier 7b93109e48 am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit 'd7f3d8ba74c25c80fcb5032e6b59e121e5546f98':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:41:15 +00:00
Christopher Ferris e088179677 am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:41:13 +00: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
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
Andrew Hsieh 58b2f1e320 am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
* commit '81f7dee74cc436fa47339a884467cc241dd86dc7':
  Switch x86 and x86_64 build to use GCC 4.9
2015-03-17 00:07:39 +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
Ying Wang 2219b1d8ef am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
* commit 'efc3a22009b15c389041427f8c74f551243b60d0':
  Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:07:43 +00: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 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
Ying Wang d4ca3b38d9 am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
  Support to configure and build multiple custom images.
2015-03-14 00:31:44 +00:00
Ying Wang ae61f50a68 Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
2015-03-14 00:06:54 +00:00
Dan Albert 78c6a1cb1a am c37d7043: am 3ad14218: Merge "Strip prebuilt shared library by default."
* commit 'c37d7043e6fde29bf14218c31132dc48a9f7e995':
  Strip prebuilt shared library by default.
2015-03-13 23:29:06 +00:00
Dan Albert 92b0082275 am e685e849: am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
* commit 'e685e849c02bb75bf0d9c871e87556472c4fca73':
  Switch NDK libraries to 4.9 for x86_64 and mips64
2015-03-13 23:29:05 +00:00
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 c856bcb9c8 am 4cdf1357: Merge "add otatools-package target"
* commit '4cdf1357433b407b350517779248e2194c88c3f4':
  add otatools-package target
2015-03-13 21:10:49 +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
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
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
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
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 8cdf72066b Merge "Change transfer list format to include block hashes" 2015-03-13 11:02:02 +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
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 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
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 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 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 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
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
Ying Wang ec447f368a am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."
* commit '168357aeda0c71cd54f9bcfe72f2fca2d3baad36':
  Support .asm being compiled by yasm targeted for x86_64.
2015-03-11 16:49:07 +00:00
Ying Wang 168357aeda Merge "Support .asm being compiled by yasm targeted for x86_64." 2015-03-11 16:37:25 +00:00
Ying Wang fb22a42d4f 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
2015-03-10 19:05:15 -07:00
Ying Wang c7ca6173ce 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
2015-03-10 11:08:05 -07:00
Ying Wang fe1e5c3453 Support .asm being compiled by yasm targeted for x86_64.
Change-Id: Ia6425c38dd2f7ad2dc697213cd61b7515b9e7aff
2015-03-09 18:57:40 -07:00
Christopher Ferris f3382443cd am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
* commit '46ba5456ad33e0674929eefff0753e21301e6eba':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-08 00:07:59 +00:00
Andreas Gampe 6faf9925b3 am e380c11d: am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
* commit 'e380c11dde6a9bffa786c0ea7a72608001c7d48e':
  Build: Fail preopting apps when there are verifier errors
2015-03-08 00:07:41 +00:00
Chih-Hung Hsieh ad19f1cc17 am 137a9fd6: am 9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
* commit '137a9fd6229b6391fa99bb5a99a087c04094b759':
  Filter out unsupported flag: -fprefetch-loop-arrays
2015-03-08 00:06:48 +00:00
Christopher Ferris 46ba5456ad am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
* commit '708b56edc879847f418108cf360bc990bb2a502a':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
2015-03-07 17:09:20 +00:00
Christopher Ferris 708b56edc8 Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty." 2015-03-06 21:27:47 +00:00
Andreas Gampe e380c11dde am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"
* commit '9a0382ffe64ad8ccecc15141779627a882f31ee0':
  Build: Fail preopting apps when there are verifier errors
2015-03-06 19:16:47 +00:00
Andreas Gampe 9a0382ffe6 Merge "Build: Fail preopting apps when there are verifier errors" 2015-03-06 19:12:09 +00:00
Christopher Ferris 9de4d5ebb3 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
2015-03-06 10:19:12 -08:00
Andreas Gampe 06d86e929d 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
2015-03-05 19:18:18 -08:00
Chih-Hung Hsieh 137a9fd622 am 9575e13a: Merge "Filter out unsupported flag: -fprefetch-loop-arrays"
* commit '9575e13aa71248b1ded3e07849a4a7523e76d639':
  Filter out unsupported flag: -fprefetch-loop-arrays
2015-03-06 01:02:27 +00:00
Chih-Hung Hsieh 78df832481 Filter out unsupported flag: -fprefetch-loop-arrays
Change-Id: I55ba9045948a910ebd76c09f9f4ebb6b37eed1e7
2015-03-05 16:02:04 -08:00
Ying Wang 8ed194d30a am a7c669f2: am 71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
* commit 'a7c669f25b087c02fae43d8ead9e9ebae3f448a3':
  Reorder lib paths in transform-bc-to-so to avoid build race condition.
2015-03-05 20:11:17 +00:00
Ying Wang a7c669f25b 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.
2015-03-05 20:05:17 +00:00
Ying Wang bfc436969d 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
2015-03-05 11:29:30 -08:00
Mohamad Ayyash 29a0178993 am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master
* commit '9b19382f0e55be199da4b3f604fc114aba8fb2fc':
  Allow flashing a squashfs system image
2015-03-05 00:01:46 +00:00