Elliott Hughes
7f880d15da
am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:58:12 +00:00
Elliott Hughes
553c289afd
am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:53:57 +00:00
Deepanshu Gupta
354ed641eb
Integrate build_font.py [DO NOT MERGE]
...
Execute the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.
Also edited the list of font directories to include in the build.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 887cd0c71e
)
2014-06-12 16:03:17 -07:00
Nick Kralevich
08ccd188e0
am 64dd84a9: am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."
...
* commit '64dd84a94f468b0e70996c55411d2be08c985267':
Add service_contexts to embedded.mk.
2014-06-12 21:16:52 +00:00
Nick Kralevich
64dd84a94f
am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."
...
* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
Add service_contexts to embedded.mk.
2014-06-12 21:10:20 +00:00
Nick Kralevich
003f84fbbb
am c80e876c: Merge "Add service_contexts to embedded.mk."
...
* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
2014-06-12 21:03:37 +00:00
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
Adam Lesinski
e20af003e4
Merge "Add drm framework library to core_tiny" into klp-modular-dev
2014-06-12 05:34:42 +00:00
Nick Kralevich
c80e876cd2
Merge "Add service_contexts to embedded.mk."
2014-06-12 05:34:11 +00:00
Riley Spahn
8b834ecedb
Add service_contexts to embedded.mk.
...
Add service_contexts to embedded.mk to support MAC checks in the
service manager.
Bug: 12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a
2014-06-12 20:45:58 +00:00
Elliott Hughes
624220c18a
Merge "Remove useless stuff from "AndroidConfig.h"."
2014-06-12 03:32:07 +00:00
Elliott Hughes
e82d33d997
Remove useless stuff from "AndroidConfig.h".
...
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.
Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
smain@google.com
b0580df308
Merge "template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274" into klp-modular-dev
2014-06-12 03:30:50 +00:00
smain@google.com
e39012b745
template changes for new sdk download pages; remove tools/ page.
...
companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274
Change-Id: I2dbc452e8ad3a2b58b86ea807ab557f19e6ada58
2014-06-13 11:43:13 -07: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
Wink Saville
273c22cbc0
Merge kwd to master
...
Add ims-common support from kwd
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-11 15:21:03 -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
Martin Blumenstingl
374e114d16
Document the worker_threads option.
...
Change-Id: I44775493bedc0c7224c2c4ef06330bdb1430a1b6
2014-06-11 23:03:44 +02: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
Andrey Belous
a2b0f685bb
delete duplicate variable definition
...
CALLED_FROM_SETUP and BUILD_SYSTEM set in get_build_var before make execution
no need to set them before calling get_build_var function
Change-Id: Ia79e11e5e3aa5c7fd337b989c16d50750b6c1442
Signed-off-by: Andrey Belous <belous.andrey@gmail.com>
2014-06-11 14:00:55 -04: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