Dirk Dougherty
3740faf550
am 89654d31
: am a6913b5c
: Adjust heading sizes and weights.
...
* commit '89654d31a3ddf62da12b5c8de8734f69ea7e0376':
Adjust heading sizes and weights.
2014-06-12 20:12:14 +00:00
Dirk Dougherty
89654d31a3
am a6913b5c
: Adjust heading sizes and weights.
...
* commit 'a6913b5c22b8eac6b5b62099c3a848a1e712d675':
Adjust heading sizes and weights.
2014-06-12 20:08:07 +00:00
Scott Main
8d87c44215
am b7de5e84
: am c29b3f58
: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
...
* commit 'b7de5e8474b18d9d9782cafb064b7412aa630ae5':
changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
2014-06-12 19:23:50 +00:00
Dirk Dougherty
a6913b5c22
Adjust heading sizes and weights.
...
Change-Id: Ib8b764bcb6c7d610e05bd6e38f8ee01a34dd5ce9
2014-06-12 19:14:24 +00:00
Scott Main
b7de5e8474
am c29b3f58
: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
...
* commit 'c29b3f58b0edc60ecaaedb652475fdad4ffe7bfd':
changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
2014-06-12 19:04:36 +00:00
Dianne Hackborn
dd0afa03f2
resolved conflicts for merge of 0c651756
to master
...
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
2014-06-12 11:34:48 -07:00
Deepanshu Gupta
04d0f5f3ab
am 887cd0c7
: Integrate build_font.py again
...
* commit '887cd0c71e756d295f6879e6b3f34753b9d67ce8':
Integrate build_font.py again
2014-06-12 16:54:20 +00:00
Scott Main
c29b3f58b0
changes to sdk template for new install workflow.
...
add auto-redirect to install page after download starts.
Change-Id: Ic084742376870ab17eefd639d50540f6222cddf6
2014-06-11 20:25:30 -07:00
Ying Wang
fa3aebf762
am b3529761
: am 2d4a27ee
: am d707b5aa
: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit 'b3529761af24d19cd8cefa2c93f91920f0dfb28f':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 21:38:20 +00:00
Ying Wang
0d26882d85
am 2ebf7c1c
: am 6b468193
: am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 21:37:45 +00:00
Dianne Hackborn
0c651756f0
Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Dianne Hackborn
997b896eeb
Update to reflect KKWT's graduation to API 20.
...
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
2014-06-11 14:24:32 -07:00
Ying Wang
1ebacee598
am 4706eb3f
: am c72592b7
: am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit '4706eb3f223890d4578a234c8ca786570f00f3a7':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 20:50:05 +00:00
Ying Wang
f2073a55fa
am f1b35fb1
: am fd76c34a
: am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'f1b35fb159cb823be2172ecdf425e902d6c1bbc3':
Allow to opt out both multilib in native test.
2014-06-11 20:49:55 +00:00
Ying Wang
1f5a7c21de
am 19aa2837
: am 49d9a894
: am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit '19aa28379f86b0938b3c6bef41ca6b89b6d91711':
Don't rename host libraries if only one arch is build.
2014-06-11 20:49:51 +00:00
Ying Wang
274ad525c1
am 32aff808
: am 6bfbfee5
: am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit '32aff8085a2f5fed34a4d28b78bb52a10a5b5751':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-11 20:49:37 +00:00
Ying Wang
01c4f4622b
am dceddd91
: am 79b46720
: am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
Fix loophole in module expansion.
2014-06-11 20:49:20 +00:00
Ying Wang
70ae5e23fc
am 0d276266
: am 128cd1b7
: am 6cc4598d
: Merge "Add global variable HOST_LIBRARY_PATH."
...
* commit '0d27626620676dbe72bf5c020008bb2dad20d75f':
Add global variable HOST_LIBRARY_PATH.
2014-06-11 20:24:22 +00:00
Elliott Hughes
59c9bea1da
am b5153477
: am c7504124
: am 47cdacd5
: Merge "Remove libportable from core_base.mk."
...
* commit 'b5153477107fd0cba9e073c4445c11c78ee35c92':
Remove libportable from core_base.mk.
2014-06-11 19:34:31 +00:00
Ying Wang
f7988507f4
am 2d19cbd2
: resolved conflicts for merge of 135e11df
to klp-modular-dev-plus-aosp
...
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
2014-06-11 19:26:30 +00:00
Ying Wang
80d3bd1582
am b06c655e
: am 322362cf
: am c0275247
: Merge "build native tests for 32-bit and 64-bit"
...
* commit 'b06c655e580e683c44354cda8a9fbcd8f30efab6':
build native tests for 32-bit and 64-bit
2014-06-11 17:58:43 +00:00
Ying Wang
541b1d0f7c
am fe9ad097
: am b1f65358
: am 5ad17493
: Merge "Support .asm being compiled by yasm targeted for x86."
...
* commit 'fe9ad0975ade10219a5fa9a77d034ba77735e393':
Support .asm being compiled by yasm targeted for x86.
2014-06-11 17:44:54 +00:00
Ying Wang
b3529761af
am 2d4a27ee
: am d707b5aa
: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit '2d4a27ee6cbd779b17eb8cd07dcbb9ff3bc8b2c0':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 17:06:02 +00:00
Ying Wang
2d4a27ee6c
am d707b5aa
: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit 'd707b5aa74730103a1978b2b47713b24bd2a7017':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 17:02:27 +00:00
Ying Wang
2ebf7c1c5f
am 6b468193
: am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:29:37 +00:00
Ying Wang
6b46819353
am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit 'cc2a47bf64b87f228b10c8f83b1575eee2aa1e76':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:27:44 +00:00
Deepanshu Gupta
887cd0c71e
Integrate build_font.py again
...
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
2014-06-10 18:41:29 -07:00
Ying Wang
4706eb3f22
am c72592b7
: am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'c72592b7bdcfbedd51198b09917a7c331a552544':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:18:28 +00:00
Ying Wang
c72592b7bd
am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:15:43 +00:00
Ying Wang
f1b35fb159
am fd76c34a
: am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'fd76c34a1700d18677a461fb3ae777dd13f813ad':
Allow to opt out both multilib in native test.
2014-06-11 01:09:44 +00:00
Ying Wang
fd76c34a17
am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
2014-06-11 01:07:14 +00:00
Ying Wang
19aa28379f
am 49d9a894
: am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit '49d9a894dcc83ecbc4589d315a9c0799ee6d8846':
Don't rename host libraries if only one arch is build.
2014-06-11 00:27:46 +00:00
Ying Wang
49d9a894dc
am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit 'cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
Don't rename host libraries if only one arch is build.
2014-06-11 00:24:10 +00:00
Ying Wang
32aff8085a
am 6bfbfee5
: am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit '6bfbfee5358715933fa90cc3ecd8fcf43338315b':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-10 23:32:41 +00:00
Ying Wang
6bfbfee535
am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit 'a45a5d27972070895001571b7912655b0bd0931c':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-10 23:28:52 +00:00
Ying Wang
dceddd91d9
am 79b46720
: am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
2014-06-10 22:29:18 +00:00
Ying Wang
79b46720e6
am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit '02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
Fix loophole in module expansion.
2014-06-10 22:25:53 +00:00
Ying Wang
cc2a47bf64
Merge "Check existence of both 64-bit and 32-bit module variants."
2014-06-10 22:20:24 +00:00
Ying Wang
ff3a904522
Check existence of both 64-bit and 32-bit module variants.
...
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.
Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang
7d883401c0
Merge "Added variables to support seperate vendor patition."
2014-06-10 22:18:15 +00:00
Ying Wang
d707b5aa74
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
2014-06-10 22:15:14 +00:00
Ying Wang
c34f37c7b5
Merge "Allow to opt out both multilib in native test."
2014-06-10 22:15:14 +00:00
Ying Wang
ad10cc76b6
Allow to opt out both multilib in native test.
...
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
2014-06-10 17:52:20 -07:00
Ying Wang
cec9dc1418
Merge "Don't rename host libraries if only one arch is build."
2014-06-10 22:15:14 +00:00
Ying Wang
b1f7fb7a50
Don't rename host libraries if only one arch is build.
...
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.
Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
2014-06-10 17:18:08 -07:00
Ying Wang
a45a5d2797
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
2014-06-10 22:15:14 +00:00
Ying Wang
6e85f8b0de
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
...
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.
Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
2014-06-10 16:24:31 -07:00
Ying Wang
b2ba5636f1
Merge "Revert "Don't rename host libraries if only one arch is build.""
2014-06-10 22:08:45 +00:00
Ying Wang
532f1127af
Revert "Don't rename host libraries if only one arch is build."
...
This reverts commit b1f7fb7a50
.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
2014-06-11 01:12:18 +00:00
Ying Wang
02f98a26c9
Merge "Fix loophole in module expansion."
2014-06-10 21:59:54 +00:00