Christopher Ferris
fc1a735ec6
am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
...
* commit '2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2':
Specify -mcpu=cortex-a15 for denver CPU variants.
2014-03-31 19:17:31 +00:00
Christopher Ferris
2d0ecc1b00
am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
...
* commit '0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
Specify -mcpu=cortex-a15 for denver CPU variants.
2014-03-31 19:11:30 +00:00
Christopher Ferris
0c4870a4cd
Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
2014-03-31 19:06:28 +00:00
Ying Wang
1758fe1f87
am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
...
* commit '30dbfa43eff071438376b5699dbe3391d08204da':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
2014-03-31 17:37:47 +00:00
Ying Wang
30dbfa43ef
am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
...
* commit '1c380c13d9bd60eefb515ea2c0a33f900a81f970':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
2014-03-31 17:34:29 +00:00
Ying Wang
1c380c13d9
Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
2014-03-31 17:30:06 +00:00
Narayan Kamath
f6811abe12
am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
...
* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
Extend the CPU ABI specification mechanism.
2014-03-31 12:21:55 +00:00
Narayan Kamath
9fbd3afdec
am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
...
* commit '431b4bb354699704e5e601483095efed93bd908c':
Extend the CPU ABI specification mechanism.
2014-03-31 12:15:37 +00:00
Narayan Kamath
431b4bb354
Merge "Extend the CPU ABI specification mechanism."
2014-03-31 12:09:51 +00:00
Narayan Kamath
39fd21a2df
Add a default value for ro.zygote.
...
Also makes sure the correct init config file is
copied across.
Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Ying Wang
ce1c596e15
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
...
Now all archs use the same strip command which can be put just in
transform-to-stripped.
Change-Id: Ief79697d47ea142fc9e63e63a7e2dace9e839165
2014-03-28 17:25:34 -07:00
Mathieu Chartier
7803fde374
am baa8a1b3: am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
...
* commit 'baa8a1b3476e3c6de6df7282b8c5b7d67aaec6de':
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
2014-03-28 20:27:33 +00:00
Mathieu Chartier
baa8a1b347
am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
...
* commit '1da02a1ae15afc7b600f9585cc4ae52c5d262192':
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
2014-03-28 19:22:14 +00:00
Mathieu Chartier
1da02a1ae1
Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
2014-03-28 19:19:13 +00:00
Narayan Kamath
1a43b375b4
Extend the CPU ABI specification mechanism.
...
Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:
ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi
For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.
Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
2014-03-28 17:10:47 +00:00
Scott Main
4a942fbb44
am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit '35fcac0f417cab5aaef9de7fae1376224a82ce0a':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:19:22 +00:00
Scott Main
35fcac0f41
am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit '70c9c2d82ba5d4647fdc6552a21130b19281849a':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:14:03 +00:00
Scott Main
70c9c2d82b
am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit 'a36253b8b05d94fb27a67522757b07781da2bd43':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:08:18 +00:00
Scott Main
a36253b8b0
fix viewport width variable by using underscore instead of hyphen
...
Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb
2014-03-27 12:56:26 -07:00
Ying Wang
9efc18fb99
am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."
...
* commit 'da3eec42e11d9ebe1e08fc7e64c7edaf59c28272':
Increase the maximum javac heap size.
2014-03-27 19:08:02 +00:00
Ying Wang
da3eec42e1
am 708242d5: Merge "Increase the maximum javac heap size."
...
* commit '708242d599cad926dc37637b04e0a71711271a17':
Increase the maximum javac heap size.
2014-03-27 19:01:45 +00:00
Ying Wang
708242d599
Merge "Increase the maximum javac heap size."
2014-03-27 18:57:17 +00:00
Scott Main
5429cdc2c8
am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit 'bb3ed6fb476f0e072a2f8e4c34cda6c5afd2116c':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:29:02 +00:00
Scott Main
9e81f2c2ec
am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '97d326ea1974bc0f060974c341767cd298196842':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:29:01 +00:00
Scott Main
bb3ed6fb47
am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit 'b8702917c61923bc4dc5f6284482e1296b783bd4':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:23:11 +00:00
Scott Main
97d326ea19
am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '514c8254d0a78a4153c442bc0789da8a10ce8b0b':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:23:11 +00:00
Scott Main
b8702917c6
am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:17:10 +00:00
Scott Main
514c8254d0
am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '4b270cdf3678998370c2c3629711797ec7ab8a5a':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:17:09 +00:00
Scott Main
75f21bc79e
Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
2014-03-27 03:15:19 +00:00
Scott Main
e921b6dedc
add 2x header logo and add override to viewport width for landing pages.
...
changing the viewport to 970 ensures proper layout space for floating divs.
Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0
2014-03-26 20:12:35 -07:00
Ying Wang
01f11b2aa9
Increase the maximum javac heap size.
...
Java 7 needs more memory when you run some annotation tools.
Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
2014-03-26 19:23:46 -07:00
Scott Main
4b270cdf36
Update the sdk templates to support the Android Wear microsite
...
Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-26 19:04:26 -07:00
Colin Cross
441e945248
resolved conflicts for merge of f3e25fea
to klp-modular-dev-plus-aosp
...
Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
2014-03-26 17:06:33 -07:00
Colin Cross
f3e25fea3a
am 007faa43: Merge "add support for LOCAL_MULTILIB"
...
* commit '007faa43cf380013e2510363b707e46884f1466c':
add support for LOCAL_MULTILIB
2014-03-26 23:58:56 +00:00
Colin Cross
007faa43cf
Merge "add support for LOCAL_MULTILIB"
2014-03-26 22:03:48 +00:00
Colin Cross
e6e48f67d8
add support for LOCAL_MULTILIB
...
LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.
Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.
Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH.
Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.
If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.
Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.
Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
2014-03-26 13:12:59 -07:00
Xavier Ducrohet
c8fea2ae98
am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev
...
* commit '7c629a728f628278986498060e649727cf5025fa':
Add annotation support lib.
2014-03-26 18:17:08 +00:00
Xavier Ducrohet
7c629a728f
am cc851243: Merge "Add annotation support lib." into klp-ub-dev
...
* commit 'cc85124393c438986e6639bc90906edf2dc2ca7a':
Add annotation support lib.
2014-03-26 18:10:46 +00:00
Xavier Ducrohet
cc85124393
Merge "Add annotation support lib." into klp-ub-dev
2014-03-26 18:06:40 +00:00
Xavier Ducrohet
ef04682fdf
Add annotation support lib.
...
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
2014-03-26 10:50:38 -07:00
Colin Cross
8295d6cd62
am ce087413: am 36a67a90: Merge topic \'tests\'
...
* commit 'ce08741397e0468185457f5c7e8aee08272e6752':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 23:44:58 +00:00
Colin Cross
ce08741397
am 36a67a90: Merge topic \'tests\'
...
* commit '36a67a9040f35fc47c0ea5cafa61910a7e2fcc66':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 16:39:30 -07:00
Colin Cross
36a67a9040
Merge topic 'tests'
...
* changes:
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 23:35:32 +00:00
Colin Cross
5a9db90e40
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
...
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames. Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.
Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
2014-03-25 13:49:58 -07:00
Colin Cross
87974056d9
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
...
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location. Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.
Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
2014-03-25 13:48:40 -07:00
Ricardo Cervera
816979cc42
am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit 'd9bc3eda8f8af202071023ffb93aaee96653dc92':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:36:42 +00:00
Ricardo Cervera
d9bc3eda8f
am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit '49b4ef0badd51ce3af0511206e20114414a6c427':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:33:03 +00:00
Ricardo Cervera
49b4ef0bad
am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:27:48 +00:00
Ricardo Cervera
fd0be925bb
docs: Added SDK version to the ADT bundles download path in the CS template.
...
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
2014-03-25 12:33:33 -07:00
Tim Murray
6440fb0c84
am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
...
* commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
Make Clang host builds hermetic on Linux.
2014-03-25 19:09:35 +00:00