OSDN Git Service
The Android Automerger [Tue, 1 Apr 2014 12:53:08 +0000 (05:53 -0700)]
"AAV01"
The Android Automerger [Tue, 1 Apr 2014 12:49:20 +0000 (05:49 -0700)]
merge in master-release history after reset to master
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.
Ying Wang [Mon, 31 Mar 2014 23:53:52 +0000 (23:53 +0000)]
Merge "Fix java version detection when _JAVA_OPTIONS is set."
The Android Automerger [Mon, 31 Mar 2014 22:57:43 +0000 (15:57 -0700)]
"AAU90B"
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"
The Android Automerger [Mon, 31 Mar 2014 12:50:14 +0000 (05:50 -0700)]
"AAU90"
The Android Automerger [Mon, 31 Mar 2014 12:49:09 +0000 (05:49 -0700)]
merge in master-release history after reset to master
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."
The Android Automerger [Sat, 29 Mar 2014 12:53:50 +0000 (05:53 -0700)]
"AAU88"
The Android Automerger [Sat, 29 Mar 2014 12:49:27 +0000 (05:49 -0700)]
merge in master-release history after reset to master
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
The Android Automerger [Fri, 28 Mar 2014 21:43:23 +0000 (14:43 -0700)]
"AAU86C"
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
The Android Automerger [Thu, 27 Mar 2014 22:20:46 +0000 (15:20 -0700)]
"AAU86B"
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."
The Android Automerger [Thu, 27 Mar 2014 12:53:22 +0000 (05:53 -0700)]
"AAU86"
The Android Automerger [Thu, 27 Mar 2014 12:49:24 +0000 (05:49 -0700)]
merge in master-release history after reset to master
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
The Android Automerger [Wed, 26 Mar 2014 22:41:19 +0000 (15:41 -0700)]
"AAU85B"
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
The Android Automerger [Wed, 26 Mar 2014 12:52:15 +0000 (05:52 -0700)]
"AAU85"
The Android Automerger [Wed, 26 Mar 2014 12:49:20 +0000 (05:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Wed, 26 Mar 2014 01:15:03 +0000 (18:15 -0700)]
"AAU84C"
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
Ricardo Cervera [Tue, 25 Mar 2014 21:23:54 +0000 (21:23 +0000)]
am
27de0f14: am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
27de0f1471daa2f7b35fff41a1fcb04f91dc8c90':
docs: Added SDK version to the ADT bundles download path in the CS template.
Tim Murray [Tue, 25 Mar 2014 21:22:55 +0000 (21:22 +0000)]
am
9c08a73b: am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
9c08a73b242344a18676a2c5b17f5d475abef16f':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 21:22:54 +0000 (21:22 +0000)]
am
3c1183a6: am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
3c1183a6634eb37d66e17c0947d9f696cd28e810':
remove libeffects from 64-bit blacklist
Ying Wang [Tue, 25 Mar 2014 21:19:18 +0000 (21:19 +0000)]
am
264a5ed3: am
711951ab: am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
264a5ed3654b71ddc3c6dc0a52371624b2fa5204':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Adam Lesinski [Fri, 14 Mar 2014 01:48:27 +0000 (18:48 -0700)]
Add LOCAL_APK_LIBRARIES to the AAPT -I flag
Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
Colin Cross [Fri, 21 Mar 2014 19:27:37 +0000 (12:27 -0700)]
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
Colin Cross [Fri, 21 Mar 2014 19:25:44 +0000 (12:25 -0700)]
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
Ricardo Cervera [Tue, 25 Mar 2014 20:42:24 +0000 (20:42 +0000)]
am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
816979cc42a362b1f4485a113b749ae7ba52c882':
docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 20:36:42 +0000 (20:36 +0000)]
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.
Ricardo Cervera [Tue, 25 Mar 2014 20:33:03 +0000 (20:33 +0000)]
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.
Ricardo Cervera [Tue, 25 Mar 2014 20:27:48 +0000 (20:27 +0000)]
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.
Ricardo Cervera [Tue, 25 Mar 2014 19:33:33 +0000 (12:33 -0700)]
docs: Added SDK version to the ADT bundles download path in the CS template.
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
Tim Murray [Tue, 25 Mar 2014 19:17:34 +0000 (19:17 +0000)]
am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
6440fb0c844068fd8be5901a2cbb1a0af0a92d15':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 19:17:33 +0000 (19:17 +0000)]
am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
3a943c9e571c027c3557bc690204751d4e872995':
remove libeffects from 64-bit blacklist
Tim Murray [Tue, 25 Mar 2014 19:09:35 +0000 (19:09 +0000)]
am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 19:09:33 +0000 (19:09 +0000)]
am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
0143ee4a5779620659c7b59e4294359c4a96af78':
remove libeffects from 64-bit blacklist
Tim Murray [Tue, 25 Mar 2014 18:36:38 +0000 (11:36 -0700)]
am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
01aa01dbfac86861c179a7922624f82d752b30ef':
Make Clang host builds hermetic on Linux.
Tim Murray [Tue, 25 Mar 2014 18:33:28 +0000 (18:33 +0000)]
Merge "Make Clang host builds hermetic on Linux."