Commit Graph

19425 Commits

Author SHA1 Message Date
Alex Light ce090d3f45 Make system use patchoat to relocate during runtime.
Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:09 -07:00
Dehao Chen f15ad97a07 Merge "Change profile use path to the newly created project." into lmp-dev 2014-08-05 00:34:22 +00:00
Dehao Chen da26f200bd Change profile use path to the newly created project.
Change-Id: I3221a3b18e16d6a50cbc561c9cae1d1ab3999090
2014-08-05 15:32:41 -07:00
Ying Wang 6922cdf425 Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev 2014-08-05 00:29:22 +00:00
Duane Sand 02f285208c [MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.

Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.

(cherry picked from commit 6bab974cdc)

Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
2014-08-05 12:39:28 -07:00
Ying Wang ef4516ef22 Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" into lmp-dev 2014-08-05 00:29:22 +00:00
Doug Zongker 9d03c1fdc4 am 56d91dd0: Merge "fall back to generating full OTA if incremental fails" into lmp-dev
* commit '56d91dd07f96039344d6976da5d985d2508c9365':
  fall back to generating full OTA if incremental fails
2014-08-04 23:17:43 +00:00
Brian Carlstrom 479eca858c resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
2014-08-04 12:21:46 -07:00
Brian Carlstrom 9b80095e6c am 430ec575: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"
* commit '430ec575cd40672aab8394c31c7e45294ee302e5':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
2014-08-04 18:33:00 +00:00
Doug Zongker 56d91dd07f Merge "fall back to generating full OTA if incremental fails" into lmp-dev 2014-08-01 17:53:35 +00:00
Doug Zongker 62d4f18a30 fall back to generating full OTA if incremental fails
Block incremental OTA generation can currently fail on some
target-files pairs.  Fall back to generating a full OTA so that the
script succeeds rather than failing.

Change-Id: Ide70395d1f3759aa2076bd173836f6a5e5b397c0
2014-08-04 16:06:43 -07:00
Ben Murdoch 70c6e14492 am 9e6ba597: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." into lmp-dev
* commit '9e6ba597ba438fd4ad314f27bb532f36a9ec5aa9':
  Remove webviewchromium from PRODUCT_BOOT_JARS.
2014-08-01 16:58:27 +00:00
Doug Zongker 4c15eda124 am 285dd138: Merge "store images in target-files" into lmp-dev
* commit '285dd13885f3960a8b6d0225dcd72edef2d1a5ab':
  store images in target-files
2014-08-01 13:50:32 +00:00
Brian Carlstrom 430ec575cd Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]" 2014-08-01 01:50:59 +00:00
Doug Zongker 285dd13885 Merge "store images in target-files" into lmp-dev 2014-07-31 21:38:33 +00:00
Doug Zongker 3c84f56948 store images in target-files
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.

- New script add_img_to_target_files is added to make the images and
  add them to the IMAGES/ subdir in the target-files.  It gets run
  from the Makefile when building a target-files.

- img_from_target_files becomes mostly vestigial: it creates the
  img.zip by just copying the images out of the target-files.  (It
  still knows how to build images for use on older target-files.)

- ota_from_target_files uses images from the target-files in
  preference to rebuilding images from the source files.

- sign_apk_target_files builds images and includes them in its output
  target files (even if the input target-files didn't have them).

Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
2014-07-31 11:06:30 -07:00
Ying Wang fe2f5fe5cf am e0383397: am e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit 'e0383397a2be0be120da20cebd77e3f1f811a6b0':
  Update host linux toolchain to gcc 4.8
2014-07-31 18:04:20 +00:00
Ying Wang e0383397a2 am e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit 'e1a77930448a93b52e6b4dbbd9aca5ad861844d4':
  Update host linux toolchain to gcc 4.8
2014-07-31 18:00:25 +00:00
Ying Wang 51e4698dc6 am 4365dcec: am 38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '4365dcece2ee9a4e91c3556d4f9a88c1cbe98dbd':
  BuildBootImage: Add secondstage image support
2014-07-31 17:31:08 +00:00
Ying Wang 4365dcece2 am 38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '38868b9bedf63578ed8ec8d426064e94f81ad862':
  BuildBootImage: Add secondstage image support
2014-07-31 17:25:48 +00:00
Dehao Chen 48065cb10e am e43c96c3: Merge "Update the FDO support:" into lmp-dev
* commit 'e43c96c332890a4641b9310aad9b4dddd80fabc0':
  Update the FDO support:
2014-07-31 16:56:10 +00:00
Elliott Hughes 1a6971b2f5 am c378352d: am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'c378352de8a07a7b8dabd444d130710ce1cb3eed':
  [MIPSR6] Add mips64r6 and mips32r6 targets
2014-07-30 23:30:07 +00:00
Elliott Hughes 81379e6590 am e4d54f31: am 0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit 'e4d54f317df641faf216e4000fbc3d091d3c1abc':
  [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
2014-07-30 23:30:05 +00:00
Elliott Hughes c378352de8 am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'd23798bfdc9bb34909177c3c5f06f0c97cc9897e':
  [MIPSR6] Add mips64r6 and mips32r6 targets
2014-07-30 23:25:19 +00:00
Elliott Hughes e4d54f317d am 0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '0b3c42cbc848726d83cea953a41c333856182cf9':
  [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
2014-07-30 23:25:19 +00:00
Brian Carlstrom 4d30e5e260 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
2014-07-30 15:57:16 -07:00
Ying Wang b4cd156bb2 am 4dfb5580: Merge "Don\'t apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
* commit '4dfb5580c2e33eebda24e377c5ce2a73a93d4258':
  Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
2014-07-30 20:50:52 +00:00
Ying Wang 4dfb5580c2 Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev 2014-07-30 20:38:44 +00:00
Ying Wang 934008f9d5 Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Bug: 16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-30 13:40:14 -07:00
Ying Wang 38868b9bed Merge "BuildBootImage: Add secondstage image support" 2014-07-30 19:31:16 +00:00
Benoit Fradin fb9076d9f2 BuildBootImage: Add secondstage image support
The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.

Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-07-31 11:20:57 +00:00
Ying Wang 2377084c0d am eac74b24: (-s ours) am 717bc3a3: Merge "Don\'t fail the build for dangling module names."
* commit 'eac74b24574478309e0bef0b2f337ff31587ac57':
  Don't fail the build for dangling module names.
2014-07-30 17:32:41 +00:00
Ying Wang 8ff81f710f am b169fb78: Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit 'b169fb78227f4a42ac239c134e547e2fd12991ca':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
2014-07-30 17:26:05 +00:00
Ying Wang eac74b2457 am 717bc3a3: Merge "Don\'t fail the build for dangling module names."
* commit '717bc3a3b7ea2d8835523d01ba020332fb76ac5a':
  Don't fail the build for dangling module names.
2014-07-30 17:26:00 +00:00
Ying Wang bb185700c3 am 9bee9d7d: (-s ours) am bb164eb6: Merge "Fix 64 bit emulator booting (again)."
* commit '9bee9d7d1137090dfd015d3b894bf5593a057991':
  Fix 64 bit emulator booting (again).
2014-07-30 17:21:49 +00:00
Ying Wang e0701e2b01 am 3b548515: (-s ours) am 4b323c62: Merge "SDK targets should inherit from core_64_bit.mk"
* commit '3b548515fbcc6a9d7baa56252038bdff6a8b608d':
  SDK targets should inherit from core_64_bit.mk
2014-07-30 17:16:04 +00:00
Ying Wang b169fb7822 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
2014-07-30 10:14:37 -07:00
Ying Wang 5b80c43cff am 7dcd694a: (-s ours) am b0da8265: Merge "Add SDK product for arm64, x86_64 and mips64."
* commit '7dcd694ae07668a734676b7e9b4529fb75d4d918':
  Add SDK product for arm64, x86_64 and mips64.
2014-07-30 17:10:27 +00:00
Ying Wang 40f92f2e5c resolved conflicts for merge of fe07e791 to lmp-dev-plus-aosp
Change-Id: I9215d5a4ffacb295addc4349dd028ccbfba71730
2014-07-30 10:05:16 -07:00
Brian Carlstrom 4a5a11e416 resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
2014-07-30 09:53:12 -07:00
Ying Wang 9bee9d7d11 am bb164eb6: Merge "Fix 64 bit emulator booting (again)."
* commit 'bb164eb64036b8e49309bc82eb0800562eaf9852':
  Fix 64 bit emulator booting (again).
2014-07-30 16:40:53 +00:00
Ying Wang 3b548515fb am 4b323c62: Merge "SDK targets should inherit from core_64_bit.mk"
* commit '4b323c62564337c96e0e0694c14d64f1c57182ee':
  SDK targets should inherit from core_64_bit.mk
2014-07-30 16:40:52 +00:00
Ying Wang 7dcd694ae0 am b0da8265: Merge "Add SDK product for arm64, x86_64 and mips64."
* commit 'b0da8265b21035641c964826e17c215972036669':
  Add SDK product for arm64, x86_64 and mips64.
2014-07-30 16:40:52 +00:00
Ying Wang fe07e79113 am 8f509bad: Merge "Remove the unused large_emu_hw.mk"
* commit '8f509bad6d1eaa9928ff54eca220ba3e72214ac7':
  Remove the unused large_emu_hw.mk
2014-07-30 16:40:51 +00:00
Brian Carlstrom a813802847 am 073dc97c: Merge "Add PROP_NAME_MAX validation"
* commit '073dc97cf2d8417709f4c77808a4cd6e8f17575e':
  Add PROP_NAME_MAX validation
2014-07-30 16:33:06 +00:00
Ying Wang 1dd586eea2 am 3f191617: am 7a739f35: Merge "Use hermetic host toolchains."
* commit '3f1916174823fe6fd034ba07c762fae9a0143e44':
  Use hermetic host toolchains.
2014-07-30 16:22:08 +00:00
Ying Wang b53efd68b5 am 18c20aae: am aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '18c20aae44b5736b673c8776202e1e76b6bd81cd':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
2014-07-30 16:22:00 +00:00
Ying Wang 4b323c6256 Merge "SDK targets should inherit from core_64_bit.mk" 2014-07-30 16:17:48 +00:00
Narayan Kamath 0ad0d197c3 SDK targets should inherit from core_64_bit.mk
bug: 15661143

(cherry picked from commit e78ba32d23)

Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
2014-07-30 09:35:08 -07:00
Ying Wang be7449b0e1 Add SDK product for arm64, x86_64 and mips64.
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-07-30 09:33:46 -07:00