OSDN Git Service
Narayan Kamath [Wed, 2 Apr 2014 11:05:22 +0000 (11:05 +0000)]
am
823f0ba6: (-s ours) am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
823f0ba6b8b52566d453d4770ac4e09f89b90842':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)]
am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
0239220a67f168fa30703e07750d1f4907dc99bf':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)]
am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
2f5de9f50460bbd369abd4218e746553f15f24fb':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:45:06 +0000 (10:45 +0000)]
Merge "Bring main.mk in sync with master."
Nicolas Geoffray [Wed, 2 Apr 2014 09:09:40 +0000 (09:09 +0000)]
am
7e28c074: am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 09:02:12 +0000 (09:02 +0000)]
am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
4ca6e2e52832d894b6387120e8b1c447121b5135':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:50:03 +0000 (08:50 +0000)]
am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
38c0ac7386f1956cf06079960886275c483e0706':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:45:55 +0000 (08:45 +0000)]
Merge "Use debug versions of dex2oat explicitly."
Dmitriy Ivanov [Wed, 2 Apr 2014 00:08:31 +0000 (00:08 +0000)]
am
7e739e54: am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
7e739e549bcf7db349d9280321149b4e6839b5ab':
Remove redundant my_target_global_ldflags
Tim Murray [Wed, 2 Apr 2014 00:03:34 +0000 (00:03 +0000)]
am
7ebce18a: am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
7ebce18ac0cff11fbc0877d108463a4538a33194':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Dmitriy Ivanov [Tue, 1 Apr 2014 23:59:48 +0000 (23:59 +0000)]
am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
836950372ba00a8e65158e84ce9f35edd25c48ec':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:55:45 +0000 (23:55 +0000)]
am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Remove redundant my_target_global_ldflags"
Dmitriy Ivanov [Tue, 1 Apr 2014 23:36:21 +0000 (16:36 -0700)]
Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
so they effectivelly override previous definition
Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
Tim Murray [Tue, 1 Apr 2014 23:32:25 +0000 (23:32 +0000)]
am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
0cad8ee2226d3af8dab854f26da405b15b3655ce':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:28:58 +0000 (23:28 +0000)]
am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
572e9accc05c467d74d3f4fbf2dbc05b8424e302':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:24:56 +0000 (23:24 +0000)]
Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."
Tim Murray [Mon, 24 Mar 2014 21:36:42 +0000 (14:36 -0700)]
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.
bug
13588226
Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
Brian Carlstrom [Tue, 1 Apr 2014 19:30:43 +0000 (19:30 +0000)]
am
4888fe34: resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
* commit '
4888fe345306cd747b03757a01089683a2e6c922':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:47:16 +0000 (11:47 -0700)]
resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76
Brian Carlstrom [Tue, 1 Apr 2014 18:33:38 +0000 (18:33 +0000)]
am
31061ccf: am
5e5d26b1: am
47e60739: Merge "cortex-a7 supports div"
* commit '
31061ccfdaf01603dfdf20f15df8021d1c7d0b85':
cortex-a7 supports div
Narayan Kamath [Tue, 1 Apr 2014 18:33:37 +0000 (18:33 +0000)]
am
b6cc8421: am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
Add a default value for ro.zygote.
Brian Carlstrom [Tue, 1 Apr 2014 18:27:32 +0000 (18:27 +0000)]
am
5e5d26b1: am
47e60739: Merge "cortex-a7 supports div"
* commit '
5e5d26b1efc6cb73e80e09598ab606678524ff21':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:23:35 +0000 (18:23 +0000)]
am
47e60739: Merge "cortex-a7 supports div"
* commit '
47e6073979254ef4fbc60554079b2bf19ac32ab1':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:11:22 +0000 (18:11 +0000)]
Merge "cortex-a7 supports div"
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
(cherry picked from commit
cece45d22652ca0d8a57a6cb03c5ca2a915a9a07)
Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
Narayan Kamath [Tue, 1 Apr 2014 16:33:26 +0000 (16:33 +0000)]
am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:26:40 +0000 (16:26 +0000)]
am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:21:58 +0000 (16:21 +0000)]
Merge "Add a default value for ro.zygote."
Narayan Kamath [Tue, 1 Apr 2014 12:00:10 +0000 (13:00 +0100)]
Bring main.mk in sync with master.
These lines were removed in aosp in commit
e2d27887b
but a bad merge conflict resolution left them in master.
Subsequent changes on master started using these variables
so they're being brought back.
Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
Nicolas Geoffray [Tue, 25 Mar 2014 11:14:26 +0000 (11:14 +0000)]
Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
Ying Wang [Tue, 1 Apr 2014 03:10:25 +0000 (03:10 +0000)]
am
ff78e652: am
9cfefe13: am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
ff78e6523189dd179a95309cb9630dab2d9f098d':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)]
am
9cfefe13: am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
9cfefe13aeb3295605ea47040767261df95d2cda':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:58:51 +0000 (02:58 +0000)]
am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
6a9f2b1250e276267ce146777fbe6084f8fa7a3f':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:51:49 +0000 (02:51 +0000)]
Merge "Add intel to the vendor whitelist"
Daniel Leung [Thu, 6 Mar 2014 19:14:14 +0000 (11:14 -0800)]
Add intel to the vendor whitelist
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Ying Wang [Tue, 1 Apr 2014 01:17:22 +0000 (18:17 -0700)]
resolved conflicts for merge of
f966bda4 to master
Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
Ying Wang [Tue, 1 Apr 2014 00:15:50 +0000 (00:15 +0000)]
am
4714d3d7: am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
4714d3d7a604391d174049a7a595e80ebab2da18':
Fix java version detection when _JAVA_OPTIONS is set.
Ying Wang [Tue, 1 Apr 2014 00:11:00 +0000 (00:11 +0000)]
am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
b34af41e578b1bbc02470d01593c45fe8b04588b':
Fix java version detection when _JAVA_OPTIONS is set.
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033
Ying Wang [Mon, 31 Mar 2014 23:53:52 +0000 (23:53 +0000)]
Merge "Fix java version detection when _JAVA_OPTIONS is set."
Peter Ammon [Mon, 31 Mar 2014 22:36:02 +0000 (15:36 -0700)]
Fix java version detection when _JAVA_OPTIONS is set.
_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.
Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
Christopher Ferris [Mon, 31 Mar 2014 19:50:03 +0000 (19:50 +0000)]
am
fc1a735e: am
2d0ecc1b: am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
fc1a735ec618791df306ad2a8f2f94a3db10284d':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:17:31 +0000 (19:17 +0000)]
am
2d0ecc1b: am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:11:30 +0000 (19:11 +0000)]
am
0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '
0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
Specify -mcpu=cortex-a15 for denver CPU variants.
Christopher Ferris [Mon, 31 Mar 2014 19:06:27 +0000 (19:06 +0000)]
Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
Ying Wang [Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)]
am
1758fe1f: am
30dbfa43: am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
1758fe1f87b58f91db569ba3c0fa406f5f37819e':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:37:47 +0000 (17:37 +0000)]
am
30dbfa43: am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
30dbfa43eff071438376b5699dbe3391d08204da':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:34:29 +0000 (17:34 +0000)]
am
1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '
1c380c13d9bd60eefb515ea2c0a33f900a81f970':
Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Ying Wang [Mon, 31 Mar 2014 17:30:06 +0000 (17:30 +0000)]
Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
Narayan Kamath [Mon, 31 Mar 2014 12:35:14 +0000 (12:35 +0000)]
am
f6811abe: am
9fbd3afd: am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
f6811abe12601c9753f329cb34da568f0072ca76':
Extend the CPU ABI specification mechanism.
Narayan Kamath [Mon, 31 Mar 2014 12:21:55 +0000 (12:21 +0000)]
am
9fbd3afd: am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
Extend the CPU ABI specification mechanism.
Narayan Kamath [Mon, 31 Mar 2014 12:15:37 +0000 (12:15 +0000)]
am
431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '
431b4bb354699704e5e601483095efed93bd908c':
Extend the CPU ABI specification mechanism.
Narayan Kamath [Mon, 31 Mar 2014 12:09:51 +0000 (12:09 +0000)]
Merge "Extend the CPU ABI specification mechanism."
Narayan Kamath [Fri, 28 Mar 2014 11:34:50 +0000 (11:34 +0000)]
Add a default value for ro.zygote.
Also makes sure the correct init config file is
copied across.
Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
Ying Wang [Sat, 29 Mar 2014 00:24:39 +0000 (17:24 -0700)]
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
Mathieu Chartier [Fri, 28 Mar 2014 22:21:56 +0000 (22:21 +0000)]
am
7803fde3: am
baa8a1b3: am
1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit '
7803fde3744305dc916b5197559da352a609d79b':
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
Mathieu Chartier [Fri, 28 Mar 2014 20:27:33 +0000 (20:27 +0000)]
am
baa8a1b3: am
1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit '
baa8a1b3476e3c6de6df7282b8c5b7d67aaec6de':
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
Mathieu Chartier [Fri, 28 Mar 2014 19:22:14 +0000 (19:22 +0000)]
am
1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit '
1da02a1ae15afc7b600f9585cc4ae52c5d262192':
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
Mathieu Chartier [Fri, 28 Mar 2014 19:19:13 +0000 (19:19 +0000)]
Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
Narayan Kamath [Wed, 26 Mar 2014 17:33:55 +0000 (17:33 +0000)]
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
Scott Main [Thu, 27 Mar 2014 20:25:54 +0000 (20:25 +0000)]
am
4a942fbb: am
35fcac0f: am
70c9c2d8: am
a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '
4a942fbb4403d0ad9079eb17c6944b7efc19bfd9':
fix viewport width variable by using underscore instead of hyphen
Scott Main [Thu, 27 Mar 2014 20:19:22 +0000 (20:19 +0000)]
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
Scott Main [Thu, 27 Mar 2014 20:14:03 +0000 (20:14 +0000)]
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
Scott Main [Thu, 27 Mar 2014 20:08:18 +0000 (20:08 +0000)]
am
a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '
a36253b8b05d94fb27a67522757b07781da2bd43':
fix viewport width variable by using underscore instead of hyphen
Scott Main [Thu, 27 Mar 2014 19:56:26 +0000 (12:56 -0700)]
fix viewport width variable by using underscore instead of hyphen
Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb
Ying Wang [Thu, 27 Mar 2014 19:14:34 +0000 (19:14 +0000)]
am
9efc18fb: am
da3eec42: am
708242d5: Merge "Increase the maximum javac heap size."
* commit '
9efc18fb99d6d4229a1d4ad993b50b6ffb15f054':
Increase the maximum javac heap size.
Ying Wang [Thu, 27 Mar 2014 19:08:02 +0000 (19:08 +0000)]
am
da3eec42: am
708242d5: Merge "Increase the maximum javac heap size."
* commit '
da3eec42e11d9ebe1e08fc7e64c7edaf59c28272':
Increase the maximum javac heap size.
Ying Wang [Thu, 27 Mar 2014 19:01:45 +0000 (19:01 +0000)]
am
708242d5: Merge "Increase the maximum javac heap size."
* commit '
708242d599cad926dc37637b04e0a71711271a17':
Increase the maximum javac heap size.
Ying Wang [Thu, 27 Mar 2014 18:57:17 +0000 (18:57 +0000)]
Merge "Increase the maximum javac heap size."
Scott Main [Thu, 27 Mar 2014 03:35:37 +0000 (03:35 +0000)]
am
5429cdc2: 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 '
5429cdc2c84bd753202897a7b3437a7fc522fd8b':
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.
Scott Main [Thu, 27 Mar 2014 03:35:36 +0000 (03:35 +0000)]
am
9e81f2c2: am
97d326ea: am
514c8254: am
4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '
9e81f2c2ece29e97d2ff87440ab18550add5170c':
Update the sdk templates to support the Android Wear microsite
Scott Main [Thu, 27 Mar 2014 03:29:02 +0000 (03:29 +0000)]
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.
Scott Main [Thu, 27 Mar 2014 03:29:01 +0000 (03:29 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:23:11 +0000 (03:23 +0000)]
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.
Scott Main [Thu, 27 Mar 2014 03:23:11 +0000 (03:23 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:17:10 +0000 (03:17 +0000)]
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.
Scott Main [Thu, 27 Mar 2014 03:17:09 +0000 (03:17 +0000)]
am
4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '
4b270cdf3678998370c2c3629711797ec7ab8a5a':
Update the sdk templates to support the Android Wear microsite
Scott Main [Thu, 27 Mar 2014 03:15:19 +0000 (03:15 +0000)]
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
Scott Main [Thu, 27 Mar 2014 02:52:14 +0000 (19:52 -0700)]
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
Ying Wang [Thu, 27 Mar 2014 02:23:46 +0000 (19:23 -0700)]
Increase the maximum javac heap size.
Java 7 needs more memory when you run some annotation tools.
Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
Scott Main [Wed, 12 Mar 2014 03:17:52 +0000 (20:17 -0700)]
Update the sdk templates to support the Android Wear microsite
Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
Colin Cross [Thu, 27 Mar 2014 00:14:05 +0000 (00:14 +0000)]
am
441e9452: resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
* commit '
441e9452488ccb98f7b0a7690b86fcdff733e5f0':
add support for LOCAL_MULTILIB
Colin Cross [Thu, 27 Mar 2014 00:06:33 +0000 (17:06 -0700)]
resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
Colin Cross [Wed, 26 Mar 2014 23:58:56 +0000 (23:58 +0000)]
am
007faa43: Merge "add support for LOCAL_MULTILIB"
* commit '
007faa43cf380013e2510363b707e46884f1466c':
add support for LOCAL_MULTILIB
Colin Cross [Wed, 26 Mar 2014 22:03:47 +0000 (22:03 +0000)]
Merge "add support for LOCAL_MULTILIB"
Colin Cross [Fri, 21 Mar 2014 19:29:32 +0000 (12:29 -0700)]
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
Xavier Ducrohet [Wed, 26 Mar 2014 18:23:15 +0000 (18:23 +0000)]
am
c8fea2ae: am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:17:08 +0000 (18:17 +0000)]
am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
7c629a728f628278986498060e649727cf5025fa':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:10:46 +0000 (18:10 +0000)]
am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
cc85124393c438986e6639bc90906edf2dc2ca7a':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:06:40 +0000 (18:06 +0000)]
Merge "Add annotation support lib." into klp-ub-dev
Xavier Ducrohet [Wed, 26 Mar 2014 17:50:38 +0000 (10:50 -0700)]
Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
Geremy Condra [Wed, 26 Mar 2014 01:03:53 +0000 (01:03 +0000)]
Merge "Add the verity key to the verity dependencies."
Adam Lesinski [Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)]
Merge "Temporarily use a separate var for including shared resources"
Adam Lesinski [Tue, 25 Mar 2014 22:45:34 +0000 (15:45 -0700)]
Temporarily use a separate var for including shared resources
Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
Colin Cross [Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)]
am
8295d6cd: am
ce087413: am
36a67a90: Merge topic \'tests\'
* commit '
8295d6cd62ba73ea66e64204d2d0ea27b4b34889':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Tue, 25 Mar 2014 23:44:58 +0000 (23:44 +0000)]
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
Colin Cross [Tue, 25 Mar 2014 23:39:30 +0000 (16:39 -0700)]
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
Colin Cross [Tue, 25 Mar 2014 23:35:32 +0000 (23:35 +0000)]
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
Ying Wang [Tue, 25 Mar 2014 21:42:46 +0000 (14:42 -0700)]
Set up dependency of resource_export_package
The rules to build $(resource_export_package) need also the
framework-res's and potentially other shared libraries' package-export.apks.
Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be