Deepanshu Gupta
c053278981
am ec02094d: Merge "Use fonts from generic device for the SDK." into lmp-dev
...
* commit 'ec02094d3ebda1db9da9fc9aec792249cbdc5217':
Use fonts from generic device for the SDK.
2014-08-10 23:03:15 +00:00
Deepanshu Gupta
ec02094d3e
Merge "Use fonts from generic device for the SDK." into lmp-dev
2014-08-10 19:43:29 +00:00
Deepanshu Gupta
4e5e582522
Use fonts from generic device for the SDK.
...
This removes the explicit list of fonts for the SDK and replaces it with
the fonts built for the generic device.
Also, the symlinked fonts are copied becuase Windows doesn't support
symlinks.
Change-Id: I8b18b2ab0149ab24448f27dbd5f9716e5d360029
2014-08-09 00:37:31 +00:00
Kenny Root
c2ed5ace0b
am fdeb0ea6: am 68715d01: Merge "Add SignTos tool"
...
* commit 'fdeb0ea673bd38b81c47504936030c62dd24a82d':
Add SignTos tool
2014-08-08 22:42:30 +00:00
Kenny Root
fdeb0ea673
am 68715d01: Merge "Add SignTos tool"
...
* commit '68715d0104b202d2cbdd281ded861c5c35fca700':
Add SignTos tool
2014-08-08 22:38:26 +00:00
Narayan Kamath
2044591c7c
am 3930fbdd: Make the 32-bit architecture for arm64 generic.
...
* commit '3930fbdd7c19c3680a76563ffe6dc36d86b892cf':
Make the 32-bit architecture for arm64 generic.
2014-08-08 22:27:15 +00:00
Kenny Root
68715d0104
Merge "Add SignTos tool"
2014-08-08 17:27:05 +00:00
Kenny Root
9221ce6705
Add SignTos tool
...
Change-Id: Iac7db75cda383e333a55236c3678cd56f8245d6e
2014-08-08 13:18:53 -07:00
Narayan Kamath
3930fbdd7c
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
2014-08-08 18:26:44 +01:00
Ying Wang
5a5d443f15
am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
...
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
Consistent use of USE_MINGW
2014-08-08 03:26:07 +00:00
Ying Wang
8ac188ff0e
am 6dbbb159: Merge "Consistent use of USE_MINGW"
...
* commit '6dbbb15997d2cf032b098a33f65387fcd36d478a':
Consistent use of USE_MINGW
2014-08-08 03:17:21 +00:00
Dan Albert
493c61af6a
am 868b22dd: am 76c942c1: Merge "Fix Windows SDK build."
...
* commit '868b22dd277392cce899d9a980270fbaf8d2f9de':
Fix Windows SDK build.
2014-08-08 02:28:11 +00:00
Dan Albert
868b22dd27
am 76c942c1: Merge "Fix Windows SDK build."
...
* commit '76c942c1645445a7b3f8b951db70f02cee270326':
Fix Windows SDK build.
2014-08-08 01:39:29 +00:00
Dan Albert
9d6aa51a0f
am e99d8947: am cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
...
* commit 'e99d8947c09731d71db7e95a280cf81f51f4049a':
Inhibit implicit -Bsymolic in -shared.
2014-08-08 00:23:56 +00:00
Dan Albert
d423e5fbdb
am 897cd3d4: am afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
...
* commit '897cd3d494272b8a6a12f0fb6d02bfe7426a309c':
Fix uses of -fPIC and -fPIE.
2014-08-08 00:23:55 +00:00
Dan Albert
e99d8947c0
am cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
...
* commit 'cbc742a1b7202dfac78795469d04c02cd323e064':
Inhibit implicit -Bsymolic in -shared.
2014-08-07 23:30:37 +00:00
Dan Albert
897cd3d494
am afae9fd8: Merge "Fix uses of -fPIC and -fPIE."
...
* commit 'afae9fd8ddf679344b456cc3ab339d9f330557a5':
Fix uses of -fPIC and -fPIE.
2014-08-07 23:30:36 +00:00
Kenny Root
cb73049485
am b12830aa: am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
...
* commit 'b12830aa796496cbbaf058ccaa0c5c576722cb9f':
Track bouncycastle upgrade to 1.51
2014-08-07 20:01:41 +00:00
Kenny Root
b12830aa79
am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
...
* commit 'fe12e8f0de6227b38365ae8681ad9df7419cc90e':
Track bouncycastle upgrade to 1.51
2014-08-07 19:57:03 +00:00
Kenny Root
fe12e8f0de
Merge "Track bouncycastle upgrade to 1.51"
2014-08-07 18:54:22 +00:00
Kenny Root
bda807d3a1
Track bouncycastle upgrade to 1.51
...
The new API in 1.51 will allow null return values.
Change-Id: I583690bf0740b2d0962f02edea3896e18626e548
2014-08-07 12:11:47 -07:00
Ying Wang
6dbbb15997
Merge "Consistent use of USE_MINGW"
2014-08-07 15:46:11 +00:00
Ying Wang
594a10ae77
Consistent use of USE_MINGW
...
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
2014-08-07 20:08:04 -07:00
Dan Albert
76c942c164
Merge "Fix Windows SDK build."
2014-08-07 14:59:23 +00:00
Dan Albert
95994def18
Fix Windows SDK build.
...
Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64
2014-08-07 18:29:11 -07:00
Dan Albert
afae9fd8dd
Merge "Fix uses of -fPIC and -fPIE."
2014-08-07 14:59:23 +00:00
Dan Albert
4803ce2696
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
2014-08-07 10:20:58 -07:00
Brian Carlstrom
84c9c28a0d
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]
2014-08-07 05:49:57 +00:00
Brian Carlstrom
d2628cb595
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
2014-08-07 05:37:58 +00:00
Alex Light
9170a80c5b
am c6b76767: Make system use patchoat to relocate during runtime.
...
* commit 'c6b76767193322b086caad0d3968552e0229b28f':
Make system use patchoat to relocate during runtime.
2014-08-07 05:37:56 +00:00
Brian Carlstrom
cced082f5d
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 4d30e5e260
)
Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
2014-08-06 17:50:39 -07:00
Brian Carlstrom
56ef86df84
resolved conflicts for merge of a8138028
to lmp-dev-plus-aosp
...
(cherry picked from commit 4a5a11e416
)
Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253
2014-08-06 17:47:40 -07:00
Dan Albert
cbc742a1b7
Merge "Inhibit implicit -Bsymolic in -shared."
2014-08-06 23:49:29 +00:00
Dan Albert
b6bb71b85d
Inhibit implicit -Bsymolic in -shared.
...
Bug: 16853291
Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
2014-08-07 15:43:16 -07:00
Alex Light
c6b7676719
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 ce090d3f45
)
Change-Id: I75a1eec3a38d6bce1f678c510d57849f8dfa04fa
2014-08-06 13:48:04 -07:00
Dehao Chen
60a27e8d35
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.
2014-08-06 03:13:54 +00:00
Colin Cross
372e0ed436
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"
2014-08-05 22:40:01 +00:00
Brian Carlstrom
cd76736081
am 557e7e54: am ce06199a: Merge "Make system use patchoat to relocate during runtime."
...
* commit '557e7e54131999d25fc75c71ad2c15d931033312':
Make system use patchoat to relocate during runtime.
2014-08-05 21:43:06 +00:00
Ying Wang
410ff1a585
am 6922cdf4: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
...
* commit '6922cdf42586db4fcc84e2c3f6cbda7d3c553a36':
[MIPSR6] Add mips64r6 and mips32r6 targets
2014-08-05 21:30:57 +00:00
Ying Wang
9aefee017b
resolved conflicts for merge of 7d595d15
to lmp-dev-plus-aosp
...
Change-Id: I16e5d927ec4e944bee8fa4f87f0d0a83a8b194ba
2014-08-05 14:29:12 -07:00
Ying Wang
7688a3c754
resolved conflicts for merge of ef4516ef
to lmp-dev-plus-aosp
...
Change-Id: I991e53af64149ee949a39892108712a2122c0b1b
2014-08-05 14:23:10 -07:00
Doug Zongker
55cbe8b157
am f8340089: add 5 minute timeout on binary patch construction
...
* commit 'f83400896de5e8bc2b21a0dce98382d9ed0ab537':
add 5 minute timeout on binary patch construction
2014-08-05 17:55:48 +00:00
Brian Carlstrom
557e7e5413
am ce06199a: Merge "Make system use patchoat to relocate during runtime."
...
* commit 'ce06199a047f81d6afe522ab4e6f489deecb46f3':
Make system use patchoat to relocate during runtime.
2014-08-05 17:51:10 +00:00
Colin Cross
8381b98869
Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
2014-08-05 17:41:31 +00:00
Colin Cross
ef77e517f7
Revert "HACK: report CPU abi as 2nd arch if present"
...
This reverts commits 8179d4dcf6
,
00c67a0568
, and
d00c0a2e20
.
Bug: 15933961
2014-08-05 11:01:54 -07:00
Ying Wang
7d595d15d3
Merge "[MIPS64] Enable mips64 clang" into lmp-dev
2014-08-05 17:41:31 +00:00
Duane Sand
1d04a53ba3
[MIPS64] Enable mips64 clang
...
(cherry picked from commit 41ca444637
)
Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
2014-08-05 12:38:31 -07:00
Duane Sand
3c4fcd8451
[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 6670e24aed
)
Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
2014-08-05 12:28:44 -07:00
Brian Carlstrom
ce06199a04
Merge "Make system use patchoat to relocate during runtime."
2014-08-05 17:41:26 +00:00
Doug Zongker
f83400896d
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
2014-08-05 10:39:37 -07:00