OSDN Git Service
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: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."
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 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: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: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: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 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: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: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: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: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: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
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
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: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: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."
Colin Cross [Tue, 25 Mar 2014 18:01:14 +0000 (11:01 -0700)]
am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
a3c76c2824c4ce1f097a4c1ae601c0fba8142bc9':
remove libeffects from 64-bit blacklist
Colin Cross [Tue, 25 Mar 2014 17:54:56 +0000 (17:54 +0000)]
Merge "remove libeffects from 64-bit blacklist"
Ying Wang [Tue, 25 Mar 2014 10:04:39 +0000 (10:04 +0000)]
am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
78a819d600ab750227009fd3dc93f7f2886600c7':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Tue, 25 Mar 2014 09:56:52 +0000 (09:56 +0000)]
am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
266cf4f2595323170fe02db05835884b4522a0f9':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Andrew Hsieh [Tue, 25 Mar 2014 02:54:46 +0000 (02:54 +0000)]
am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
c550cd45536c7153726c502886bf32797e997dd3':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 02:48:23 +0000 (19:48 -0700)]
am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
fa97fe67d32860e498acd59eabb7dbc71ca2ff31':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 02:43:57 +0000 (02:43 +0000)]
Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
Tim Murray [Thu, 20 Mar 2014 20:48:35 +0000 (13:48 -0700)]
Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.
bug
13435344
Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
Andrew Hsieh [Sat, 22 Mar 2014 12:36:07 +0000 (20:36 +0800)]
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.
Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
Colin Cross [Tue, 25 Mar 2014 01:39:30 +0000 (18:39 -0700)]
remove libeffects from 64-bit blacklist
Everything under frameworks/av/media/libeffects compiles fine for
64-bit
Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
Ying Wang [Mon, 24 Mar 2014 21:21:26 +0000 (21:21 +0000)]
am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
f39752e99b4e5083f1e91c46722f87def8143b49':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Shu Zhang [Mon, 24 Mar 2014 08:15:18 +0000 (16:15 +0800)]
Specify -mcpu=cortex-a15 for denver CPU variants.
Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
Ying Wang [Sat, 22 Mar 2014 00:03:34 +0000 (00:03 +0000)]
am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:54:48 +0000 (16:54 -0700)]
am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
8c60a1df4379bcc2fef020878aef8d78233f906d':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:51:33 +0000 (23:51 +0000)]
Merge "Complete installed shared library dependency"
Ying Wang [Fri, 21 Mar 2014 23:17:04 +0000 (16:17 -0700)]
Complete installed shared library dependency
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.
Bug:
13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
Mark Renouf [Fri, 21 Mar 2014 16:22:07 +0000 (16:22 +0000)]
am
37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '
37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 15:50:35 +0000 (11:50 -0400)]
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
Ying Wang [Fri, 21 Mar 2014 00:28:57 +0000 (17:28 -0700)]
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug:
11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
Colin Cross [Thu, 20 Mar 2014 20:23:05 +0000 (20:23 +0000)]
am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
189a874f0f3d297107d02222dc3291943a9e82b0':
remove more projects from 64-bit blacklist
Colin Cross [Thu, 20 Mar 2014 20:20:04 +0000 (13:20 -0700)]
am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
8c1bbdb96ee1ea6be4d35236d8af20d5a2d78f6f':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 20:18:38 +0000 (20:18 +0000)]
am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
Colin Cross [Thu, 20 Mar 2014 20:16:53 +0000 (20:16 +0000)]
Merge "remove more projects from 64-bit blacklist"
Ying Wang [Thu, 20 Mar 2014 20:14:12 +0000 (13:14 -0700)]
am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
1c43aaea07fdf2665f1d2305fe16cb29811b32ee':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 20:11:04 +0000 (20:11 +0000)]
Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 19:57:19 +0000 (12:57 -0700)]
Remove the redundant DISABLE_DEXPREOPT
To disable dexpreopt, use just:
WITH_DEXPREOPT=false
Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
Ying Wang [Thu, 20 Mar 2014 19:36:32 +0000 (19:36 +0000)]
am
9ce34617: am
4f9d6f57: Merge "Fix embedded build"
* commit '
9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
Ying Wang [Thu, 20 Mar 2014 19:28:30 +0000 (12:28 -0700)]
am
4f9d6f57: Merge "Fix embedded build"
* commit '
4f9d6f57fdea05904c6f45c7799aa7a0d0a32457':
Fix embedded build
Ying Wang [Thu, 20 Mar 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:13:10 +0000 (12:13 -0700)]
Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a