OSDN Git Service
Narayan Kamath [Fri, 8 Aug 2014 22:33:33 +0000 (22:33 +0000)]
am
2044591c: am
3930fbdd: Make the 32-bit architecture for arm64 generic.
* commit '
2044591c7c7476d2145e3d66d6aebddf6e80edc6':
Make the 32-bit architecture for arm64 generic.
Narayan Kamath [Fri, 8 Aug 2014 22:27:15 +0000 (22:27 +0000)]
am
3930fbdd: Make the 32-bit architecture for arm64 generic.
* commit '
3930fbdd7c19c3680a76563ffe6dc36d86b892cf':
Make the 32-bit architecture for arm64 generic.
Narayan Kamath [Fri, 8 Aug 2014 17:26:44 +0000 (18:26 +0100)]
Make the 32-bit architecture for arm64 generic.
The idea is that we want to be able to build a single 32+64 APK
whose 32 bit code can run on 32 bit devices, where we can't assume
cortex-a15 or NEON.
Change-Id: Ia6bf400fa472924a94b08cef83e9e5dea09222ab
Ying Wang [Fri, 8 Aug 2014 03:31:03 +0000 (03:31 +0000)]
am
5a5d443f: am
8ac188ff: am
6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '
5a5d443f156fb61a365773d617e5d2747eeea26d':
Consistent use of USE_MINGW
Ying Wang [Fri, 8 Aug 2014 03:26:07 +0000 (03:26 +0000)]
am
8ac188ff: am
6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '
8ac188ff0e739ea75ea02166c54428245200f088':
Consistent use of USE_MINGW
Ying Wang [Fri, 8 Aug 2014 03:17:21 +0000 (03:17 +0000)]
am
6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '
6dbbb15997d2cf032b098a33f65387fcd36d478a':
Consistent use of USE_MINGW
Dan Albert [Fri, 8 Aug 2014 03:15:37 +0000 (03:15 +0000)]
am
493c61af: am
868b22dd: am
76c942c1: Merge "Fix Windows SDK build."
* commit '
493c61af6a6d877b4e0ab6b6a385b665b3bc81a7':
Fix Windows SDK build.
Dan Albert [Fri, 8 Aug 2014 02:28:11 +0000 (02:28 +0000)]
am
868b22dd: am
76c942c1: Merge "Fix Windows SDK build."
* commit '
868b22dd277392cce899d9a980270fbaf8d2f9de':
Fix Windows SDK build.
Dan Albert [Fri, 8 Aug 2014 01:39:29 +0000 (01:39 +0000)]
am
76c942c1: Merge "Fix Windows SDK build."
* commit '
76c942c1645445a7b3f8b951db70f02cee270326':
Fix Windows SDK build.
Dan Albert [Fri, 8 Aug 2014 00:29:31 +0000 (00:29 +0000)]
am
9d6aa51a: am
e99d8947: am
cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
* commit '
9d6aa51a0f4bce097b595a6df7cbb09a36c5bf67':
Inhibit implicit -Bsymolic in -shared.
Dan Albert [Fri, 8 Aug 2014 00:29:30 +0000 (00:29 +0000)]
am
d423e5fb: am
897cd3d4: am
afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
* commit '
d423e5fbdb15b2077a2f93281f43506ba06873c9':
Fix uses of -fPIC and -fPIE.
Dan Albert [Fri, 8 Aug 2014 00:23:56 +0000 (00:23 +0000)]
am
e99d8947: am
cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
* commit '
e99d8947c09731d71db7e95a280cf81f51f4049a':
Inhibit implicit -Bsymolic in -shared.
Dan Albert [Fri, 8 Aug 2014 00:23:55 +0000 (00:23 +0000)]
am
897cd3d4: am
afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
* commit '
897cd3d494272b8a6a12f0fb6d02bfe7426a309c':
Fix uses of -fPIC and -fPIE.
Dan Albert [Thu, 7 Aug 2014 23:30:37 +0000 (23:30 +0000)]
am
cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
* commit '
cbc742a1b7202dfac78795469d04c02cd323e064':
Inhibit implicit -Bsymolic in -shared.
Dan Albert [Thu, 7 Aug 2014 23:30:36 +0000 (23:30 +0000)]
am
afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
* commit '
afae9fd8ddf679344b456cc3ab339d9f330557a5':
Fix uses of -fPIC and -fPIE.
Kenny Root [Thu, 7 Aug 2014 20:05:07 +0000 (20:05 +0000)]
am
cb730494: am
b12830aa: am
fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
* commit '
cb73049485fe563a428899c40431c0493fe28ce8':
Track bouncycastle upgrade to 1.51
Kenny Root [Thu, 7 Aug 2014 20:01:41 +0000 (20:01 +0000)]
am
b12830aa: am
fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
* commit '
b12830aa796496cbbaf058ccaa0c5c576722cb9f':
Track bouncycastle upgrade to 1.51
Kenny Root [Thu, 7 Aug 2014 19:57:03 +0000 (19:57 +0000)]
am
fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
* commit '
fe12e8f0de6227b38365ae8681ad9df7419cc90e':
Track bouncycastle upgrade to 1.51
Kenny Root [Thu, 7 Aug 2014 19:53:21 +0000 (19:53 +0000)]
Merge "Track bouncycastle upgrade to 1.51"
Kenny Root [Thu, 7 Aug 2014 19:02:54 +0000 (12:02 -0700)]
Track bouncycastle upgrade to 1.51
The new API in 1.51 will allow null return values.
Change-Id: I583690bf0740b2d0962f02edea3896e18626e548
Ying Wang [Fri, 8 Aug 2014 03:14:23 +0000 (03:14 +0000)]
Merge "Consistent use of USE_MINGW"
Ying Wang [Fri, 8 Aug 2014 03:08:04 +0000 (20:08 -0700)]
Consistent use of USE_MINGW
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
Dan Albert [Fri, 8 Aug 2014 01:37:01 +0000 (01:37 +0000)]
Merge "Fix Windows SDK build."
Dan Albert [Fri, 8 Aug 2014 01:29:11 +0000 (18:29 -0700)]
Fix Windows SDK build.
Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64
Dan Albert [Thu, 7 Aug 2014 23:24:28 +0000 (23:24 +0000)]
Merge "Fix uses of -fPIC and -fPIE."
Dan Albert [Wed, 6 Aug 2014 19:36:46 +0000 (12:36 -0700)]
Fix uses of -fPIC and -fPIE.
We've been using -fPIC and -fPIE together in the global cflags all this
time. These options are incompatible. The only reason we haven't been
hit by this before is because of the forced -Bsymbolic in GCC. To fix
this, pass -fpic when compiling objects for shared libraries and -fpie
when compiling objects for executables. For static libraries, also use
-fpic. We have to do this because static libraries might be included in
either a shared library or an executable. Code compiled with -fpie
cannot be included in a shared library, but code compiled with -fpic
may be included in an executable.
We've also been using -fpic and -fPIC together. These are different
options, and only the latter will take effect.
http://stackoverflow.com/a/967010
The final thing this fixes is that we had -f(PIC|PIE) flags being passed
to link commands. These are compile time flags, and don't do anything at
link time.
Bug:
16823325
Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
Brian Carlstrom [Thu, 7 Aug 2014 05:57:48 +0000 (05:57 +0000)]
am
84c9c28a: am
cced082f: (-s ours) Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
* commit '
84c9c28a0d9f98d3fdbaa1d5b2639712468c1fe0':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
Brian Carlstrom [Thu, 7 Aug 2014 05:49:57 +0000 (05:49 +0000)]
am
cced082f: (-s ours) Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
* commit '
cced082f5d8e6386815a5cfba125789e78c5e7ca':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
Brian Carlstrom [Thu, 7 Aug 2014 05:44:30 +0000 (05:44 +0000)]
am
d2628cb5: am
56ef86df: resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
* commit '
d2628cb5956d699581eacbfa03577abfd2661789':
resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
Alex Light [Thu, 7 Aug 2014 05:44:29 +0000 (05:44 +0000)]
am
9170a80c: am
c6b76767: Make system use patchoat to relocate during runtime.
* commit '
9170a80c5b51db9423f56f18729df4d01eff064a':
Make system use patchoat to relocate during runtime.
Brian Carlstrom [Thu, 7 Aug 2014 05:37:58 +0000 (05:37 +0000)]
am
56ef86df: resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
* commit '
56ef86df84ba7d8b26b663f49ae40f8c86b4b95b':
resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
Alex Light [Thu, 7 Aug 2014 05:37:56 +0000 (05:37 +0000)]
am
c6b76767: Make system use patchoat to relocate during runtime.
* commit '
c6b76767193322b086caad0d3968552e0229b28f':
Make system use patchoat to relocate during runtime.
Brian Carlstrom [Tue, 29 Jul 2014 02:13:27 +0000 (19:13 -0700)]
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
(cherry picked from commit
4d30e5e2604a77df2acd41e36cbca54cd42cbf0a)
Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
Brian Carlstrom [Wed, 30 Jul 2014 16:53:12 +0000 (09:53 -0700)]
resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
(cherry picked from commit
4a5a11e416425689d9f37a1963ae852051b451d2)
Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253
Dan Albert [Thu, 7 Aug 2014 23:24:36 +0000 (23:24 +0000)]
Merge "Inhibit implicit -Bsymolic in -shared."
Dan Albert [Tue, 5 Aug 2014 21:44:41 +0000 (14:44 -0700)]
Inhibit implicit -Bsymolic in -shared.
Bug:
16853291
Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
Alex Light [Thu, 24 Jul 2014 23:26:13 +0000 (16:26 -0700)]
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
(cherry picked from commit
ce090d3f4508cb9130ab700833ae51a7fff8b373)
Change-Id: I75a1eec3a38d6bce1f678c510d57849f8dfa04fa
Dehao Chen [Wed, 6 Aug 2014 17:38:29 +0000 (17:38 +0000)]
am
60a27e8d: am
f15ad97a: Merge "Change profile use path to the newly created project." into lmp-dev
* commit '
60a27e8d354de16193e2682a180e073c0ec42fe6':
Change profile use path to the newly created project.
Colin Cross [Wed, 6 Aug 2014 17:34:33 +0000 (17:34 +0000)]
am
372e0ed4: am
8381b988: Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
* commit '
372e0ed4361a8d66045a758a0044dd2dceb308e3':
Revert "HACK: report CPU abi as 2nd arch if present"
Brian Carlstrom [Wed, 6 Aug 2014 12:10:56 +0000 (12:10 +0000)]
am
cd767360: am
557e7e54: am
ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit '
cd767360817d8687b6b209d4178d0f65085da31d':
Make system use patchoat to relocate during runtime.
Ying Wang [Wed, 6 Aug 2014 12:09:35 +0000 (12:09 +0000)]
am
410ff1a5: am
6922cdf4: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
* commit '
410ff1a58556bae504c590eaefe23b8ae68c8865':
[MIPSR6] Add mips64r6 and mips32r6 targets
Ying Wang [Wed, 6 Aug 2014 12:09:34 +0000 (12:09 +0000)]
am
9aefee01: resolved conflicts for merge of
7d595d15 to lmp-dev-plus-aosp
* commit '
9aefee017b642d70f7cd541e49d22d9c5a98bd24':
[MIPS64] Enable mips64 clang
Ying Wang [Wed, 6 Aug 2014 12:09:33 +0000 (12:09 +0000)]
am
7688a3c7: resolved conflicts for merge of
ef4516ef to lmp-dev-plus-aosp
* commit '
7688a3c754ac48e726fe681ff9d6162275f15c6b':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Dehao Chen [Wed, 6 Aug 2014 03:13:54 +0000 (03:13 +0000)]
am
f15ad97a: Merge "Change profile use path to the newly created project." into lmp-dev
* commit '
f15ad97a0737ad42f663e1ca1702f6cf1831e532':
Change profile use path to the newly created project.
Colin Cross [Tue, 5 Aug 2014 22:40:01 +0000 (22:40 +0000)]
am
8381b988: Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
* commit '
8381b988698bf891add85608648dfe1cc0c599bc':
Revert "HACK: report CPU abi as 2nd arch if present"
Brian Carlstrom [Tue, 5 Aug 2014 21:43:06 +0000 (21:43 +0000)]
am
557e7e54: am
ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit '
557e7e54131999d25fc75c71ad2c15d931033312':
Make system use patchoat to relocate during runtime.
Ying Wang [Tue, 5 Aug 2014 21:30:57 +0000 (21:30 +0000)]
am
6922cdf4: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
* commit '
6922cdf42586db4fcc84e2c3f6cbda7d3c553a36':
[MIPSR6] Add mips64r6 and mips32r6 targets
Ying Wang [Tue, 5 Aug 2014 21:29:12 +0000 (14:29 -0700)]
resolved conflicts for merge of
7d595d15 to lmp-dev-plus-aosp
Change-Id: I16e5d927ec4e944bee8fa4f87f0d0a83a8b194ba
Ying Wang [Tue, 5 Aug 2014 21:23:10 +0000 (14:23 -0700)]
resolved conflicts for merge of
ef4516ef to lmp-dev-plus-aosp
Change-Id: I991e53af64149ee949a39892108712a2122c0b1b
Doug Zongker [Tue, 5 Aug 2014 17:59:11 +0000 (17:59 +0000)]
am
55cbe8b1: am
f8340089: add 5 minute timeout on binary patch construction
* commit '
55cbe8b157925ddcbaad37d9dffefda16dcda285':
add 5 minute timeout on binary patch construction
Doug Zongker [Tue, 5 Aug 2014 17:55:48 +0000 (17:55 +0000)]
am
f8340089: add 5 minute timeout on binary patch construction
* commit '
f83400896de5e8bc2b21a0dce98382d9ed0ab537':
add 5 minute timeout on binary patch construction
Brian Carlstrom [Tue, 5 Aug 2014 17:51:10 +0000 (17:51 +0000)]
am
ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit '
ce06199a047f81d6afe522ab4e6f489deecb46f3':
Make system use patchoat to relocate during runtime.
Colin Cross [Tue, 5 Aug 2014 22:28:54 +0000 (22:28 +0000)]
Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
Colin Cross [Tue, 5 Aug 2014 17:54:14 +0000 (10:54 -0700)]
Ying Wang [Tue, 5 Aug 2014 21:04:48 +0000 (21:04 +0000)]
Merge "[MIPS64] Enable mips64 clang" into lmp-dev
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
(cherry picked from commit
41ca4446370ba90e472e45a8897868855185a6c7)
Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
Duane Sand [Tue, 22 Jul 2014 21:34:00 +0000 (14:34 -0700)]
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.
Also: drop unused soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.
(cherry picked from commit
6670e24aed1ca66f21a6af759a0d156bb3df1739)
Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
Brian Carlstrom [Tue, 5 Aug 2014 17:47:26 +0000 (17:47 +0000)]
Merge "Make system use patchoat to relocate during runtime."
Doug Zongker [Tue, 5 Aug 2014 17:39:37 +0000 (10:39 -0700)]
add 5 minute timeout on binary patch construction
When making bsdiff/imgdiff patches, give up after 5 minutes. (On
certain large files it can take hours to build a patch, if it ever
even completes.)
Change-Id: I123c06f8194f85f6f4e640f7eb31c7746f76ba4d
Alex Light [Thu, 24 Jul 2014 23:26:13 +0000 (16:26 -0700)]
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
Dehao Chen [Wed, 6 Aug 2014 03:06:49 +0000 (03:06 +0000)]
Merge "Change profile use path to the newly created project." into lmp-dev
Dehao Chen [Tue, 5 Aug 2014 22:08:06 +0000 (15:08 -0700)]
Change profile use path to the newly created project.
Change-Id: I3221a3b18e16d6a50cbc561c9cae1d1ab3999090
Ying Wang [Tue, 5 Aug 2014 21:05:01 +0000 (21:05 +0000)]
Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
Duane Sand [Wed, 9 Jul 2014 20:30:52 +0000 (13:30 -0700)]
[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
6bab974cdc90cb3a7514c7255b6e6adfb9c98e2b)
Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
Ying Wang [Tue, 5 Aug 2014 21:04:37 +0000 (21:04 +0000)]
Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" into lmp-dev
Doug Zongker [Mon, 4 Aug 2014 23:21:40 +0000 (23:21 +0000)]
am
9d03c1fd: am
56d91dd0: Merge "fall back to generating full OTA if incremental fails" into lmp-dev
* commit '
9d03c1fdc43d3a8b12feccf321534b4bebed6898':
fall back to generating full OTA if incremental fails
Doug Zongker [Mon, 4 Aug 2014 23:17:43 +0000 (23:17 +0000)]
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
Brian Carlstrom [Mon, 4 Aug 2014 19:31:46 +0000 (19:31 +0000)]
am
479eca85: resolved conflicts for merge of
9b80095e to lmp-dev-plus-aosp
* commit '
479eca858c85fb0a6cfa073012dba1dee6906030':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
Brian Carlstrom [Mon, 4 Aug 2014 19:21:46 +0000 (12:21 -0700)]
resolved conflicts for merge of
9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
Brian Carlstrom [Mon, 4 Aug 2014 18:33:00 +0000 (18:33 +0000)]
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]
Ben Murdoch [Fri, 1 Aug 2014 21:01:17 +0000 (21:01 +0000)]
am
70c6e144: am
9e6ba597: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." into lmp-dev
* commit '
70c6e14492e137bcde20d2a20c0e98a830a81fcb':
Remove webviewchromium from PRODUCT_BOOT_JARS.
Doug Zongker [Fri, 1 Aug 2014 20:59:43 +0000 (20:59 +0000)]
am
4c15eda1: am
285dd138: Merge "store images in target-files" into lmp-dev
* commit '
4c15eda124fd79794d31874fa54381509efd5cd8':
store images in target-files
Doug Zongker [Mon, 4 Aug 2014 23:08:54 +0000 (23:08 +0000)]
Merge "fall back to generating full OTA if incremental fails" into lmp-dev
Doug Zongker [Mon, 4 Aug 2014 23:06:43 +0000 (16:06 -0700)]
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
Ben Murdoch [Fri, 1 Aug 2014 16:58:27 +0000 (16:58 +0000)]
am
9e6ba597: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." into lmp-dev
* commit '
9e6ba597ba438fd4ad314f27bb532f36a9ec5aa9':
Remove webviewchromium from PRODUCT_BOOT_JARS.
Doug Zongker [Fri, 1 Aug 2014 13:50:32 +0000 (13:50 +0000)]
am
285dd138: Merge "store images in target-files" into lmp-dev
* commit '
285dd13885f3960a8b6d0225dcd72edef2d1a5ab':
store images in target-files
Brian Carlstrom [Mon, 4 Aug 2014 18:27:33 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"
Doug Zongker [Thu, 31 Jul 2014 22:33:19 +0000 (22:33 +0000)]
Merge "store images in target-files" into lmp-dev
Ying Wang [Thu, 31 Jul 2014 18:08:59 +0000 (18:08 +0000)]
am
fe2f5fe5: am
e0383397: am
e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit '
fe2f5fe5cfe4277392b56c6e97c9dd5cd46f29ad':
Update host linux toolchain to gcc 4.8
Doug Zongker [Thu, 31 Jul 2014 18:06:30 +0000 (11:06 -0700)]
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
Ying Wang [Thu, 31 Jul 2014 18:04:20 +0000 (18:04 +0000)]
am
e0383397: am
e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit '
e0383397a2be0be120da20cebd77e3f1f811a6b0':
Update host linux toolchain to gcc 4.8
Ying Wang [Thu, 31 Jul 2014 18:00:25 +0000 (18:00 +0000)]
am
e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit '
e1a77930448a93b52e6b4dbbd9aca5ad861844d4':
Update host linux toolchain to gcc 4.8
Ying Wang [Thu, 31 Jul 2014 17:36:10 +0000 (17:36 +0000)]
am
51e4698d: am
4365dcec: am
38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '
51e4698dc6ccfe5dc2b050b53f2703fdddf9350b':
BuildBootImage: Add secondstage image support
Ying Wang [Thu, 31 Jul 2014 17:31:08 +0000 (17:31 +0000)]
am
4365dcec: am
38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '
4365dcece2ee9a4e91c3556d4f9a88c1cbe98dbd':
BuildBootImage: Add secondstage image support
Ying Wang [Thu, 31 Jul 2014 17:25:48 +0000 (17:25 +0000)]
am
38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '
38868b9bedf63578ed8ec8d426064e94f81ad862':
BuildBootImage: Add secondstage image support
Dehao Chen [Thu, 31 Jul 2014 17:02:23 +0000 (17:02 +0000)]
am
48065cb1: am
e43c96c3: Merge "Update the FDO support:" into lmp-dev
* commit '
48065cb10ebd5f63d172a53cafd81bcaaa0f6e7b':
Update the FDO support:
Dehao Chen [Thu, 31 Jul 2014 16:56:10 +0000 (16:56 +0000)]
am
e43c96c3: Merge "Update the FDO support:" into lmp-dev
* commit '
e43c96c332890a4641b9310aad9b4dddd80fabc0':
Update the FDO support:
Elliott Hughes [Wed, 30 Jul 2014 23:35:27 +0000 (23:35 +0000)]
am
1a6971b2: am
c378352d: am
d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit '
1a6971b2f555525b684c804d5326e0e6a4f3effc':
[MIPSR6] Add mips64r6 and mips32r6 targets
Elliott Hughes [Wed, 30 Jul 2014 23:35:26 +0000 (23:35 +0000)]
am
81379e65: am
e4d54f31: am
0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '
81379e6590689b0852da40f6477d8d32525d934b':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Elliott Hughes [Wed, 30 Jul 2014 23:30:07 +0000 (23:30 +0000)]
am
c378352d: am
d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit '
c378352de8a07a7b8dabd444d130710ce1cb3eed':
[MIPSR6] Add mips64r6 and mips32r6 targets
Elliott Hughes [Wed, 30 Jul 2014 23:30:05 +0000 (23:30 +0000)]
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
Elliott Hughes [Wed, 30 Jul 2014 23:25:19 +0000 (23:25 +0000)]
am
d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit '
d23798bfdc9bb34909177c3c5f06f0c97cc9897e':
[MIPSR6] Add mips64r6 and mips32r6 targets
Elliott Hughes [Wed, 30 Jul 2014 23:25:19 +0000 (23:25 +0000)]
am
0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '
0b3c42cbc848726d83cea953a41c333856182cf9':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Brian Carlstrom [Tue, 29 Jul 2014 02:13:27 +0000 (19:13 -0700)]
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
Ying Wang [Wed, 30 Jul 2014 20:55:28 +0000 (20:55 +0000)]
am
b4cd156b: am
4dfb5580: Merge "Don\'t apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
* commit '
b4cd156bb2946bb074be6afcfb6c905ed35334ef':
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Ying Wang [Wed, 30 Jul 2014 20:50:52 +0000 (20:50 +0000)]
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
Ying Wang [Wed, 30 Jul 2014 20:44:35 +0000 (20:44 +0000)]
Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
Ying Wang [Wed, 30 Jul 2014 20:40:14 +0000 (13:40 -0700)]
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Bug:
16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
Ying Wang [Thu, 31 Jul 2014 17:05:36 +0000 (17:05 +0000)]
Merge "BuildBootImage: Add secondstage image support"
Benoit Fradin [Mon, 14 Jul 2014 19:00:43 +0000 (21:00 +0200)]
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>