p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,891 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

4669 Commits

Author SHA1 Message Date
Ying Wang c9c3ed2299 am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 
* commit '5d33de08196b5c77a58a3e3a045a1b3bf31e09a7':
  Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
 2014-04-07 22:48:38 +00:00
Ying Wang 25c0096bd3 am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc." 
* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
  Different bootclasspath for droiddoc.
 2014-04-07 22:48:37 +00:00
Ying Wang bdac8cf148 Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 2014-04-07 22:41:22 +00:00
Ying Wang be835b6f3e am 90219d98: am cb733bc5: Merge "Fix droiddoc generation." 
* commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
  Fix droiddoc generation.
 2014-04-07 22:36:43 +00:00
Ying Wang 5b6b46459c Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found" 
It seems to be a javac/javadoc bug.
See https://code.google.com/p/doclava/issues/detail?id=38

sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar,
but sometimes on some platform javadoc/javac can't find it.
-XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym
and link against rt.jar directly.

Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
 2014-04-07 15:19:33 -07:00
Ying Wang 584d8adbea Different bootclasspath for droiddoc. 
- If it's host module, don't set bootclasspath;
- If it's arget module,
  - It can build against the API stubs;
  - It can build against a historical SDK version;
  - It can build against core.jar

Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
 2014-04-07 15:14:50 -07:00
Narayan Kamath f122d41b75 Fix droiddoc generation. 
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.

This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.

bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
 2014-04-07 15:08:18 -07:00
Scott Kennedy 98029d9dcb am ee16b2c2: am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields 
* commit 'ee16b2c23cd787f0f60e81a3b2704ceb3d9f4f6f':
  Keep Parcelable CREATOR fields
 2014-04-07 19:32:40 +00:00
Scott Kennedy ee16b2c23c am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields 
* commit '2452774c0be2d6ebf2d433045d172787c90772ca':
  Keep Parcelable CREATOR fields
 2014-04-07 19:09:11 +00:00
Scott Kennedy 2452774c0b am 62eb51af: Keep Parcelable CREATOR fields 
* commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375':
  Keep Parcelable CREATOR fields
 2014-04-07 19:02:54 +00:00
Scott Kennedy 62eb51af23 Keep Parcelable CREATOR fields 
Change-Id: I64451134a9d11d17307ef4d8ea923df5fe5e37ed
 2014-04-07 11:50:23 -07:00
Ying Wang 821b37d817 am 0df45b08: am 260942fa: Merge "Build with java7 by default." 
* commit '0df45b0898710a2e7ddd723fae450ad701a4614d':
  Build with java7 by default.
 2014-04-05 01:53:59 +00:00
Narayan Kamath c84889b80a Build with java7 by default. 
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
	core/main.mk
 2014-04-04 18:44:47 -07:00
Ying Wang 7d43b0f6a5 am f90ef06f: am 73c1422d: am b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set." 
* commit 'f90ef06f0847f2adba3248859376775112ab1a81':
  Disable host -fPIE if BUILD_HOST_static is set.
 2014-04-04 23:25:19 +00:00
Ying Wang f90ef06f08 am 73c1422d: am b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set." 
* commit '73c1422dd297553948ebfc4603fe852aa9a0336a':
  Disable host -fPIE if BUILD_HOST_static is set.
 2014-04-04 23:19:20 +00:00
Doug Zongker f12362a1a1 Merge "select recovery assets based on target density" 2014-04-04 21:51:58 +00:00
Doug Zongker 25d55f8733 select recovery assets based on target density 
Recovery now has different res-*dpi directories for different display
densities.  Select one based on the highest density specified in
PRODUCT_AAPT_CONFIG.

Change-Id: Ieb0657a08e5df87f914fdda78a038cbbf82619e9
 2014-04-04 14:41:05 -07:00
Ying Wang faf3d5ed0f Disable host -fPIE if BUILD_HOST_static is set. 
It turns out -static doesn't work with -fPIE.

Bug: 13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
 2014-04-04 14:38:14 -07:00
Narayan Kamath 422fadcf79 Build with java7 by default. 
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
 2014-04-04 09:55:57 +01:00
Ying Wang 8700eb6049 am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." 
* commit '88e1a1103acaf5e61fd11a7c006a0c465214ac78':
  Unset _JAVA_OPTIONS before running "java -version".
 2014-04-03 08:31:27 +00:00
Ying Wang 88e1a1103a am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." 
* commit '680e037007fd0f4207a4734b8fccce17a91ee682':
  Unset _JAVA_OPTIONS before running "java -version".
 2014-04-03 01:57:25 +00:00
Ying Wang 8a52b231d2 Unset _JAVA_OPTIONS before running "java -version". 
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.

Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
 2014-04-02 18:15:10 -07:00
Torne (Richard Coles) dc74b38040 am e4915bbe: am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 
* commit 'e4915bbebbaaeb337df5dec87b82c18d186a6bfb':
  Add GYP as a target type that requires 2nd arch.
 2014-04-02 17:31:04 +00:00
Torne (Richard Coles) e4915bbebb am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 
* commit '59d0c658847d3c8118de46d2d7fa1fa3bfc563d2':
  Add GYP as a target type that requires 2nd arch.
 2014-04-02 17:27:53 +00:00
Torne (Richard Coles) c783b9bda9 Merge "Add GYP as a target type that requires 2nd arch." 2014-04-02 17:20:11 +00:00
Narayan Kamath bfc9b30d36 am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds." 
* commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
  Add warning message for java6 builds.
 2014-04-02 12:26:38 +00:00
Narayan Kamath bee0ec4196 Add warning message for java6 builds. 
The instruction URL has been amended and a few additional
details have been added.

(cherry picked from 8c06afdea3)

Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
 2014-04-02 13:16:15 +01:00
Narayan Kamath 839d2829bc am 35200762: am e28df19e: Merge "Call "java[c] -version" only once" 
* commit '35200762980aa2c0f90e73e38af94fd29b50f91f':
  Call "java[c] -version" only once
 2014-04-02 10:57:13 +00:00
Narayan Kamath 823f0ba6b8 am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." 
* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
  Bring main.mk in sync with master.
 2014-04-02 10:57:13 +00:00
Ying Wang 8d45e51803 Call "java[c] -version" only once 
and print out the full output if error occurs.
Bug: 11672548

(cherry picked from 7b66d366bf)

Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
 2014-04-02 10:45:17 +00:00
Narayan Kamath 2f5de9f504 Merge "Bring main.mk in sync with master." 2014-04-02 10:45:07 +00:00
Torne (Richard Coles) 3972253b0f Add GYP as a target type that requires 2nd arch. 
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.

Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
 2014-04-02 11:33:17 +01:00
Nicolas Geoffray 108df57861 am 7e28c074: am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." 
* commit '7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4':
  Use debug versions of dex2oat explicitly.
 2014-04-02 09:09:40 +00:00
Nicolas Geoffray 7e28c07427 am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." 
* commit '4ca6e2e52832d894b6387120e8b1c447121b5135':
  Use debug versions of dex2oat explicitly.
 2014-04-02 09:02:12 +00:00
Nicolas Geoffray 38c0ac7386 Merge "Use debug versions of dex2oat explicitly." 2014-04-02 08:45:56 +00:00
Dmitriy Ivanov cc73396810 am 7e739e54: am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" 
* commit '7e739e549bcf7db349d9280321149b4e6839b5ab':
  Remove redundant my_target_global_ldflags
 2014-04-02 00:08:31 +00:00
Tim Murray a6e629e8d5 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.
 2014-04-02 00:03:34 +00:00
Dmitriy Ivanov 7e739e549b am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" 
* commit '836950372ba00a8e65158e84ce9f35edd25c48ec':
  Remove redundant my_target_global_ldflags
 2014-04-01 23:59:48 +00:00
Dmitriy Ivanov 00479a9fe0 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
 2014-04-01 16:36:21 -07:00
Tim Murray 7ebce18ac0 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.
 2014-04-01 23:32:25 +00:00
Tim Murray 125a3c9fb0 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
 2014-04-01 16:08:51 -07:00
Brian Carlstrom 3415c72d7c am 31061ccf: am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div" 
* commit '31061ccfdaf01603dfdf20f15df8021d1c7d0b85':
  cortex-a7 supports div
 2014-04-01 18:33:38 +00:00
Brian Carlstrom 31061ccfda am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div" 
* commit '5e5d26b1efc6cb73e80e09598ab606678524ff21':
  cortex-a7 supports div
 2014-04-01 18:27:32 +00:00
Brian Carlstrom 49c80cd9b6 cortex-a7 supports div 
(cherry picked from commit cece45d226)

Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
 2014-04-01 10:25:59 -07:00
Narayan Kamath d5fb782682 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
 2014-04-01 13:13:13 +01:00
Nicolas Geoffray ed154c3ba6 Use debug versions of dex2oat explicitly. 
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
 2014-04-01 08:43:26 +01:00
Ying Wang 923f21d903 am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist" 
* commit 'ff78e6523189dd179a95309cb9630dab2d9f098d':
  Add intel to the vendor whitelist
 2014-04-01 03:10:25 +00:00
Ying Wang ff78e65231 am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist" 
* commit '9cfefe13aeb3295605ea47040767261df95d2cda':
  Add intel to the vendor whitelist
 2014-04-01 03:05:06 +00:00
Daniel Leung 625974cf2a 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>
 2014-04-01 10:38:12 +08:00
Ying Wang 710e0265bc resolved conflicts for merge of f966bda4 to master 
Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
 2014-03-31 18:17:22 -07:00
Ying Wang f966bda49f 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.
 2014-04-01 00:15:50 +00:00
Brian Carlstrom cece45d226 cortex-a7 supports div 
Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033
 2014-03-31 16:58:09 -07:00
Ying Wang b34af41e57 Merge "Fix java version detection when _JAVA_OPTIONS is set." 2014-03-31 23:53:52 +00:00
Peter Ammon bb406bf4c0 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
 2014-03-31 15:36:02 -07:00
Christopher Ferris 707354c0ad 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.
 2014-03-31 19:50:03 +00:00
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 0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00
Ying Wang 82784b285a 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
 2014-03-31 17:43:57 +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 1c380c13d9 Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" 2014-03-31 17:30:06 +00:00
Narayan Kamath b4d757b1b2 am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism." 
* commit 'f6811abe12601c9753f329cb34da568f0072ca76':
  Extend the CPU ABI specification mechanism.
 2014-03-31 12:35:14 +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 431b4bb354 Merge "Extend the CPU ABI specification mechanism." 2014-03-31 12:09:51 +00: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 376c686d7e 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
 2014-03-28 22:21:56 +00: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 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
Ying Wang d2c1f1228d am 9efc18fb: am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size." 
* commit '9efc18fb99d6d4229a1d4ad993b50b6ffb15f054':
  Increase the maximum javac heap size.
 2014-03-27 19:14:34 +00: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 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
Colin Cross 6443630cca am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp 
* commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0':
  add support for LOCAL_MULTILIB
 2014-03-27 00:14:05 +00: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 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 86c0cf68c8 am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev 
* commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
  Add annotation support lib.
 2014-03-26 18:23:15 +00: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
Adam Lesinski 9d9dbaba77 Merge "Temporarily use a separate var for including shared resources" 2014-03-26 00:41:00 +00:00
Adam Lesinski 5eebe0f1b4 Temporarily use a separate var for including shared resources 
Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
 2014-03-25 17:00:35 -07:00
Colin Cross c93c10a75b 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
 2014-03-25 23:48:13 +00: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
Ying Wang dbe23f5d98 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
 2014-03-25 14:42:46 -07:00
Tim Murray 1bbba7d404 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.
 2014-03-25 21:22:55 +00:00
Colin Cross 9b269f228c am 3c1183a6: am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist" 
* commit '3c1183a6634eb37d66e17c0947d9f696cd28e810':
  remove libeffects from 64-bit blacklist
 2014-03-25 21:22:54 +00:00
Ying Wang c63d345b18 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
 2014-03-25 21:19:18 +00:00
Adam Lesinski de057c3063 Add LOCAL_APK_LIBRARIES to the AAPT -I flag 
Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
 2014-03-25 13:52:17 -07: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
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
Colin Cross 3a943c9e57 am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist" 
* commit '0143ee4a5779620659c7b59e4294359c4a96af78':
  remove libeffects from 64-bit blacklist
 2014-03-25 19:09:33 +00:00
Tim Murray e64ce73e54 am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux." 
* commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
  Make Clang host builds hermetic on Linux.
 2014-03-25 18:40:07 +00:00
Tim Murray 01aa01dbfa Merge "Make Clang host builds hermetic on Linux." 2014-03-25 18:33:29 +00:00
Colin Cross 35bd1357c9 am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist" 
* commit '0143ee4a5779620659c7b59e4294359c4a96af78':
  remove libeffects from 64-bit blacklist
 2014-03-25 18:07:12 +00:00
Colin Cross a3c76c2824 Merge "remove libeffects from 64-bit blacklist" 2014-03-25 17:54:56 +00:00
Ying Wang 711951abf0 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
 2014-03-25 10:04:39 +00:00
Ying Wang 78a819d600 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
 2014-03-25 09:56:52 +00:00
Andrew Hsieh 1477080e34 am cde91b3e: am 0adc6431: am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION" 
* commit 'cde91b3e6a42e66cb45e75eb69111f37840dffec':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
 2014-03-25 03:34:29 +00:00
Andrew Hsieh 0adc643104 am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION" 
* commit 'c550cd45536c7153726c502886bf32797e997dd3':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
 2014-03-25 02:54:46 +00:00
Andrew Hsieh 72e8d2a3a4 am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION" 
* commit 'c550cd45536c7153726c502886bf32797e997dd3':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
 2014-03-25 02:54:04 +00:00
Tim Murray 02cefc93a8 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
 2014-03-24 19:38:47 -07:00
Andrew Hsieh 92d50c1a10 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
 2014-03-25 09:46:27 +08:00
Colin Cross 966c9194a6 remove libeffects from 64-bit blacklist 
Everything under frameworks/av/media/libeffects compiles fine for
64-bit

Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
 2014-03-24 18:40:11 -07:00
Ying Wang 288bf3a377 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
 2014-03-24 21:26:51 +00:00
Ying Wang 266cf4f259 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
 2014-03-24 21:21:26 +00:00
Ying Wang 595f996f0d am 7a93f683: am 82a2ae71: am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency" 
* commit '7a93f68322eca5ccf32ca9544ba63ec64548e050':
  Complete installed shared library dependency
 2014-03-24 19:36:32 +00:00
Shu Zhang 453afb242c Specify -mcpu=cortex-a15 for denver CPU variants. 
Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
 2014-03-24 16:19:50 +08:00
Ying Wang 82a2ae714c am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency" 
* commit '5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
  Complete installed shared library dependency
 2014-03-22 00:03:34 +00:00
Ying Wang 1f5c4f67d4 am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency" 
* commit '5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
  Complete installed shared library dependency
 2014-03-21 23:58:10 +00:00
Ying Wang d8d3721240 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
 2014-03-21 16:17:04 -07:00
Jeff Sharkey 26d22f7139 Import OEM build properties, if defined. 
Certain products can define a list of system properties that should be
delegated to the OEM.  Since these properties may be ro.*, we give
them first shot at defining.

Also support blacklist of properties that should never be defined by
build.prop, used to delegate to runtime fingerprint generation.

Bug: 13367676
Change-Id: I3f00db732f485818205a7b76b31edbdc3a89aac0
 2014-03-21 13:22:54 -07:00
Narayan Kamath 9c2daa97e1 Merge "Add warning message for java6 builds." 2014-03-21 10:43:49 +00:00
Ying Wang f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS 
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
 2014-03-20 17:28:57 -07:00
Colin Cross 58596266c8 am e07f9225: am 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist" 
* commit 'e07f922563e5f3a093187a1e260451c3544bc051':
  remove more projects from 64-bit blacklist
 2014-03-20 22:27:16 +00:00
Ying Wang 81717cc251 am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT" 
* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
  Remove the redundant DISABLE_DEXPREOPT
 2014-03-20 22:27:16 +00:00
Ying Wang 636dc20d1a resolved conflicts for merge of ad495272 to master 
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
 2014-03-20 15:24:52 -07:00
Colin Cross 7e998752d7 am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist" 
* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
  remove more projects from 64-bit blacklist
 2014-03-20 20:23:05 +00:00
Colin Cross 3c23ee5e19 am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist" 
* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
  remove more projects from 64-bit blacklist
 2014-03-20 20:22:59 +00:00
Ying Wang 996f3826f7 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT" 
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
 2014-03-20 20:18:38 +00:00
Ying Wang 3c598d19b2 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT" 
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
 2014-03-20 20:18:32 +00:00
Colin Cross 8c1bbdb96e Merge "remove more projects from 64-bit blacklist" 2014-03-20 20:16:53 +00:00
Ying Wang c6848b398d Remove the redundant DISABLE_DEXPREOPT 
To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
 2014-03-20 13:01:31 -07:00
Ying Wang 7796921cc5 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build" 
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
 2014-03-20 19:38:45 +00:00
Ying Wang 46d69e9914 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build" 
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
 2014-03-20 19:36:32 +00:00
Ying Wang 8c7e74ee05 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
 2014-03-20 12:13:10 -07:00
Narayan Kamath 8c06afdea3 Add warning message for java6 builds. 
Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8
 2014-03-20 10:35:52 +00:00
Colin Cross e6d118574b remove more projects from 64-bit blacklist 
These all build now.

Change-Id: If7c5f58512a2931617900ddc730797750ab8301c
 2014-03-20 00:08:20 -07:00
Mathieu Chartier 3408ca0e0d Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000 
Required for getting ART with valgrind on device working since
valgrind maps things in the 0x60000000 address range.

Bug: 13323732

Change-Id: I05efdbf3fe5acd1418e1d4ced5844154fb4c5d37
 2014-03-19 16:52:43 -07:00
Glenn Kasten 994014964f am 9a3f4999: am a7c9d15e: am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist." 
* commit '9a3f499978cc46b35e76f2d9dd4a282b4b0a649f':
  A few other removals for the 64 bit blacklist.
 2014-03-19 21:53:49 +00:00
Glenn Kasten a7c9d15e82 am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist." 
* commit 'b614ef1eef10815652451c332954a6a6ee6f02ba':
  A few other removals for the 64 bit blacklist.
 2014-03-19 21:44:07 +00:00
Glenn Kasten 63e579b4e0 am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist." 
* commit 'b614ef1eef10815652451c332954a6a6ee6f02ba':
  A few other removals for the 64 bit blacklist.
 2014-03-19 21:41:39 +00:00
Glenn Kasten cb902fff82 Merge "A few other removals for the 64 bit blacklist." 2014-03-19 21:32:22 +00:00
Christopher Ferris ddb9b4042e am 10eaabfc: am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library." 
* commit '10eaabfceb715baecbcdf71ebfb4f108ce295fb6':
  Add a method to leave the symbol table in a library.
 2014-03-19 18:25:22 +00:00
Christopher Ferris a908fc96db am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library." 
* commit 'aea9f041f72a128065691ac402ccdb72a5a7aad4':
  Add a method to leave the symbol table in a library.
 2014-03-19 18:15:39 +00:00
Christopher Ferris 810cf65d71 am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library." 
* commit 'aea9f041f72a128065691ac402ccdb72a5a7aad4':
  Add a method to leave the symbol table in a library.
 2014-03-19 18:15:39 +00:00
Narayan Kamath c7d24d029b A few other removals for the 64 bit blacklist. 
- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.

Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264
 2014-03-19 13:15:31 +00:00
Tim Kilbourn 772af0c643 am d5c004b3: am 2389da57: am 8acc8da4: Add v17/leanback to pathmap. 
* commit 'd5c004b39483bcd599d03098e7d3bd8af88b23a1':
  Add v17/leanback to pathmap.
 2014-03-19 09:42:20 +00:00
Tim Kilbourn 2389da5787 am 8acc8da4: Add v17/leanback to pathmap. 
* commit '8acc8da42d1971792090f3b80b1900427e5d37fc':
  Add v17/leanback to pathmap.
 2014-03-19 09:23:43 +00:00
Christopher Ferris a6e2f9322c Add a method to leave the symbol table in a library. 
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.

This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.

Bug: 12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
 2014-03-18 17:34:41 -07:00
Ying Wang 8888faa549 am 5245393e: am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning" 
* commit '5245393ef6b18c181fac43111a1dbfa6f829af01':
  Remove arm64 clang build warning
 2014-03-18 23:17:40 +00:00
Ying Wang e36870862e am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning" 
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning
 2014-03-18 23:07:49 +00:00
Ying Wang 51d4cd2491 am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning" 
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning
 2014-03-18 23:07:47 +00:00
Ying Wang ed56902c29 Remove arm64 clang build warning 
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
 2014-03-18 15:58:13 -07:00
Brian Carlstrom 6c6d9b1f58 Merge "Try to catch more misuse of $(my-dir)." into klp-dev-plus-aosp 2014-03-18 22:20:33 +00:00
Tim Kilbourn 8acc8da42d Add v17/leanback to pathmap. 
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
 2014-03-18 15:20:15 -07:00
Ying Wang ae5a1e1447 Try to catch more misuse of $(my-dir). 
(cherry picked from commit 79e8319b2e)

Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
 2014-03-18 15:11:44 -07:00
Glenn Kasten f2a57a5697 am 66b6b628: am 0c2acdc0: am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit" 
* commit '66b6b62822d60b2d5b590df1263b61bf119f37ae':
  Don't blacklist all of frameworks/av for 64-bit
 2014-03-18 22:01:52 +00:00
Glenn Kasten d50da36c8b am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit" 
* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
  Don't blacklist all of frameworks/av for 64-bit
 2014-03-18 21:54:01 +00:00
Glenn Kasten 0c2acdc042 am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit" 
* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
  Don't blacklist all of frameworks/av for 64-bit
 2014-03-18 21:53:41 +00:00
Glenn Kasten 97542cc9bf Merge "Don't blacklist all of frameworks/av for 64-bit" 2014-03-18 21:45:12 +00:00
Ying Wang 145374e097 am 1bd53e59: am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES." 
* commit '1bd53e59558f7973a038f4b0d5c78a7fdfa45f91':
  Remove unused LOCAL_ASSET_FILES.
 2014-03-18 20:52:55 +00:00
Glenn Kasten 488fe8481a Don't blacklist all of frameworks/av for 64-bit 
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
 2014-03-18 12:12:54 -07:00
Ying Wang 5968350855 am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES." 
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.
 2014-03-18 18:44:32 +00:00
Ying Wang 8824386987 am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES." 
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.
 2014-03-18 18:44:05 +00:00
Ying Wang 594f2a4261 Remove unused LOCAL_ASSET_FILES. 
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
 2014-03-18 11:31:09 -07:00
Andrew Hsieh 96000a611a am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 
* commit '314b5c98cbd68d11e7484b5e35a1bea466cde66b':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
 2014-03-18 00:15:28 +00:00
Andrew Hsieh 23371f350a am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
 2014-03-18 00:09:32 +00:00
Andrew Hsieh 66a4ef8f75 am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
 2014-03-18 00:09:13 +00:00
Andrew Hsieh 73d800e519 Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared 
Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
 2014-03-17 20:30:45 +08:00
Ying Wang f132da6b50 am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE" 
* commit 'df0c90d0e544c9353df0135a23643aea043a9f4b':
  Don't modify LOCAL_STRIP_MODULE
 2014-03-16 20:16:45 +00:00
Ying Wang 8196f6159e am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE" 
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE
 2014-03-16 20:08:32 +00:00
Ying Wang ce4187832a am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE" 
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE
 2014-03-16 20:08:31 +00:00
Ying Wang 1cda15d323 Merge "Don't modify LOCAL_STRIP_MODULE" 2014-03-16 20:02:56 +00:00
Ying Wang e1889af2d5 Don't modify LOCAL_STRIP_MODULE 
LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed
 2014-03-16 12:43:49 -07:00
Colin Cross 0af8bc1ed1 am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang." 
* commit 'c48da22b6d0f7be0b9ce9f1d448fc524e692e86c':
  Work in progress to enable build system support for Clang.
 2014-03-16 00:06:17 +00:00
Colin Cross f6da0820b3 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang." 
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
 2014-03-16 00:00:20 +00:00
Colin Cross 8213b719c8 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang." 
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
 2014-03-15 23:59:32 +00:00
Colin Cross db24577bbd Merge "Work in progress to enable build system support for Clang." 2014-03-15 23:54:03 +00:00
Andrew Hsieh 51ffb467a9 am 70dff286: am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX" 
* commit '70dff2866fd7a22a7248a80fd888d167c0f7636a':
  Fix HOST_TOOLCHAIN_PREFIX
 2014-03-14 17:13:11 +00:00
Tim Murray b5f333bbef Work in progress to enable build system support for Clang. 
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
 2014-03-14 00:39:03 -07:00
Dianne Hackborn 6668799e7b resolved conflicts for merge of 264d4001 to klp-dev-plus-aosp 
Change-Id: Ib95e5f6a6a5a613395a13a9df3d283348576d241
 2014-03-13 17:35:26 -07:00
Andrew Hsieh 2fceaccc30 am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX" 
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX
 2014-03-14 00:26:58 +00:00
Andrew Hsieh 228f8afc4d am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX" 
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX
 2014-03-14 00:26:55 +00:00
Andrew Hsieh 933e8940d0 Merge "Fix HOST_TOOLCHAIN_PREFIX" 2014-03-14 00:19:19 +00:00
Hui Shu 2ecd9fc969 Merge "Fix another build break." 2014-03-13 23:35:42 +00:00
Hui Shu ec21c58574 Fix another build break. 
The doclava build does not need to depend on the intermedidate
removed.txt. It depends on public_api.txt. Removed.txt is generated
along with public_api.txt by doclava.

BUG: b/11293324
Change-Id: Ia5ea675bbfb15b81ce6ae81cf34c608e83676ca1
 2014-03-13 16:31:21 -07:00
Narayan Kamath 70df4dc56a am 2c852c33: am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 
* commit '2c852c3399d86ae2f25fe4205d8e4bd4a3ce971f':
  Revert "Remove external/chromium from the 64 bit blacklist."
 2014-03-13 23:11:49 +00:00
Hui Shu f6a9b877b5 Fix the build break. 
BUG: b/11293324
Should find the removed.txt under frameworks/base/api/

Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e
 2014-03-13 15:40:55 -07:00
Hui Shu 749aee5f5e Merge "Add removed.txt for doclava api consistency check" 2014-03-13 22:11:23 +00:00
Narayan Kamath a813b73579 am e00d0e7c: am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist." 
* commit 'e00d0e7c6a5b63489faa3e8e9de6285b11f7b8e9':
  Remove external/chromium from the 64 bit blacklist.
 2014-03-13 21:20:36 +00:00
Narayan Kamath dc8541686c Revert "Remove external/chromium from the 64 bit blacklist." 
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
 2014-03-13 11:26:26 -07:00
Narayan Kamath c88d174010 Remove external/chromium from the 64 bit blacklist. 
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
 2014-03-13 11:26:26 -07:00
Ben Cheng b0f8c44069 OProfile is no longer compiled now. 
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
 2014-03-13 11:26:26 -07:00
Narayan Kamath bde97f477b Amend 64 bit blacklist. 
- external/skia now builds on arm64, frameworks/base/libs/hwui
  depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
  isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
  build because of their dependency on frameworks/av.

frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).

Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
 2014-03-13 11:26:26 -07:00
JP Abgrall 7e09b998c3 DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok 
This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b3.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
 2014-03-13 11:26:26 -07:00
JP Abgrall 470125849d DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad 
This is until aosp gets the latest libpcap+tcpdump currently only on internal.

This reverts commit 5c68e265ac.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
 2014-03-13 11:26:26 -07:00
Ying Wang f3ba9484b5 Remove external/tcpdump from 64-bit build blacklist. 
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
 2014-03-13 11:26:26 -07:00
Elliott Hughes 1c71a43aef oprofile/daemon doesn't build for x86_64. 
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
 2014-03-13 11:26:26 -07:00
Ying Wang 579ea43d87 Remove external/wpa_supplicant_8 and external/android-clat 
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
 2014-03-13 11:26:26 -07:00
Elliott Hughes 7813000d49 Take libcore off the LP64 blacklist. 
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
 2014-03-13 11:26:26 -07:00
Colin Cross 9bdcdff615 HACK: add 64-bit directory blacklist 
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
 2014-03-13 11:26:26 -07:00
Colin Cross c92f1407a1 add support for module supported or unsupported target architectures 
Add four new variables for module makefiles:

LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures.  Any architecture not in the list will be
not attempt to build the module.  The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.

LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.

The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk

Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
 2014-03-13 11:26:04 -07:00
Dmitriy Ivanov 96ad54d132 am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" 
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
 2014-03-13 15:54:41 +00:00
Narayan Kamath f262d87f01 am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 
* commit '237f5414ebf38e1386307679947641f72865fc38':
  Revert "Remove external/chromium from the 64 bit blacklist."
 2014-03-13 09:33:58 +00:00
Narayan Kamath cc8d6dab9a Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 2014-03-13 09:29:52 +00:00
Narayan Kamath c00ab8e012 Revert "Remove external/chromium from the 64 bit blacklist." 
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
 2014-03-13 09:29:22 +00:00
Narayan Kamath f6869e25c9 am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist." 
* commit '709169725a34836b3f388526aee714f070f20103':
  Remove external/chromium from the 64 bit blacklist.
 2014-03-13 09:18:00 +00:00
Narayan Kamath 252496247f Merge "Remove external/chromium from the 64 bit blacklist." 2014-03-13 09:05:32 +00:00
Ying Wang 895520a782 am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG" 
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
 2014-03-13 01:55:11 +00:00
Ian Rogers bf9670a38b am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences." 
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
 2014-03-13 01:54:43 +00:00
Ian Rogers dae5ebc949 am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."" 
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
 2014-03-13 01:54:41 +00:00
Dmitriy Ivanov b1758f2376 am abfea0ac: am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" 
* commit 'abfea0ac92964024996dc487028f1b4896e1bdf0':
  Add TARGET_2ND_ARCH to dumpvar
 2014-03-12 22:57:47 +00:00
Dmitriy Ivanov 7ba6258a7b am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" 
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
 2014-03-12 18:49:19 +00:00
Dmitriy Ivanov d5cd1e2ecf Add TARGET_2ND_ARCH to dumpvar 
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
 2014-03-12 11:13:41 -07:00
Narayan Kamath 27bf51144a Remove external/chromium from the 64 bit blacklist. 
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
 2014-03-12 14:43:38 +00:00
Andrew Hsieh cbe162e914 Fix HOST_TOOLCHAIN_PREFIX 
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
 2014-03-12 19:27:59 +08:00
Dianne Hackborn 264d4001e7 am 7503e736: 4.4.3 is MR2, version boogaloo! 
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!
 2014-03-11 23:22:38 +00:00
Dianne Hackborn 7503e736eb 4.4.3 is MR2, version boogaloo! 
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
 2014-03-11 14:54:09 -07:00
Ian Rogers 7d5d35d465 am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
 2014-03-11 18:52:52 +00:00
Ying Wang 04691b3947 am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version" 
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version
 2014-03-11 18:52:31 +00:00
Nicolas Geoffray e7be6ffa98 am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc." 
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
  Do not remove the generated .hpp file from yacc.
 2014-03-11 18:29:45 +00:00
Nicolas Geoffray 6b92a7018e am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat." 
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
  Remove host-prefix command line argument to dex2oat.
 2014-03-11 18:29:12 +00:00
Andrew Hsieh f25a976fa6 am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer" 
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
 2014-03-11 18:28:59 +00:00
Nicolas Geoffray 5ebef36646 am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files." 
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
  Extend YACC and LEX handling to .yy and .ll files.
 2014-03-11 18:28:25 +00:00
Ying Wang 009f48b00f am a6230641: am 26bcd640: Merge "Try to catch more misuse of ." 
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
 2014-03-11 18:17:42 +00:00
Ying Wang 8ec7041127 am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts." 
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.
 2014-03-11 18:16:49 +00:00
Ying Wang 9638890678 am 66a9b789: Merge "Include privileged apps with app zip file." 
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
 2014-03-11 18:16:01 +00:00
Ying Wang 84ee17bd65 am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules." 
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
  Conditionally include the 'samplecode' rules.
 2014-03-11 18:08:18 +00:00
Torne (Richard Coles) bbc3a3eda3 am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
  Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
 2014-03-11 18:08:03 +00:00
Ying Wang d98291e74e am 66331624: Merge "Fix prebuilt library dependency for multilib build" 
* commit '66331624b5422a608607a9924f174ba533573032':
  Fix prebuilt library dependency for multilib build
 2014-03-11 18:07:57 +00:00
Ying Wang 64255e639b am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
 2014-03-11 17:12:21 +00:00
Ying Wang df925cefc1 am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG" 
* commit 'f91a014f6f2c176f6e1f99cb3bb90d707e0be31c':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
 2014-03-11 02:15:11 +00:00
Ying Wang 0a196075ee am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG" 
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
 2014-03-11 02:08:45 +00:00
Ying Wang ba8b377d89 Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG 
Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
 2014-03-10 18:59:12 -07:00
Ian Rogers 67d675af0e am d5cd41fe: am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences." 
* commit 'd5cd41fe6d9d140e84703e87cec1f83660e568e3':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
 2014-03-11 00:37:50 +00:00
Ian Rogers 9573917699 am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences." 
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
 2014-03-11 00:01:57 +00:00
Ian Rogers aa54033b46 Define __STDC_CONSTANT_MACROS globally to work around host build differences. 
Change-Id: I945128b3087b28f62467c7123b759e3514027574
 2014-03-10 16:49:41 -07:00
Ian Rogers 17fe9e3000 am 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."" 
* commit '17536801ea179360da3ba2886dfc48dda392d28a':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
 2014-03-10 23:42:20 +00:00
Ian Rogers e25c0b2599 am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."" 
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
 2014-03-10 23:37:13 +00:00
Ian Rogers c61a9425cd Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
This reverts commit 668427c941.

Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
 2014-03-10 23:27:01 +00:00
Ian Rogers 368790a734 am 4d16757b: am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
* commit '4d16757b201003cd25b0b27a717b1bc7c32a6dd8':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
 2014-03-10 22:58:18 +00:00
Ian Rogers 848361f97e am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
 2014-03-10 22:51:08 +00:00
Ian Rogers 668427c941 Define __STDC_LIMIT_MACROS globally to work around host build differences. 
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
 2014-03-10 15:30:39 -07:00
Ying Wang 7670415852 am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version" 
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version
 2014-03-10 19:29:36 +00:00
Chris Wren 22e3835e33 jdk error message should not mention the version 
the version is checked elsewhere

Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
 2014-03-10 12:25:31 -07:00
Ying Wang 2c5666fc4d am eb9b62e0: Merge "Make -rpath-link work with multilib." 
* commit 'eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
  Make -rpath-link work with multilib.
 2014-03-10 18:06:15 +00:00
Tim Murray c3ba600f58 am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP." 
* commit '254a88b9578883f3138be6991c7bcdb8393af188':
  Switch to LLVM 3.4 prebuilts in AOSP.
 2014-03-10 18:06:06 +00:00
Adam Hampson c723626e23 am 0dfd6681: am deb46244: am 57afaa53: Add init.environ.rc to installclean 
* commit '0dfd668138b8b9448fcec818d29df5b37f06be96':
  Add init.environ.rc to installclean
 2014-03-08 05:45:32 +00:00
Adam Hampson deb462442f am 57afaa53: Add init.environ.rc to installclean 
* commit '57afaa537361e7f5c12c049b13b831c1126b3cad':
  Add init.environ.rc to installclean
 2014-03-08 01:54:46 +00:00
Adam Hampson 57afaa5373 Add init.environ.rc to installclean 
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.

Bug: 13282187

Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
 2014-03-07 15:55:18 -08:00
Ying Wang f5ad2b9253 resolved conflicts for merge of 9aadde67 to klp-dev-plus-aosp 
Change-Id: I6102f1f092dd4c1d131e5cc6f4180c2fbdc93b53
 2014-03-07 15:07:51 -08:00
Ying Wang 4438454b2a am 9335001d: Merge "Strip all symbols on x86" 
* commit '9335001d5d15777522455d5f593a9a69719b12b7':
  Strip all symbols on x86
 2014-03-07 22:59:40 +00:00
Ying Wang 6df34fbc84 am e72beb53: Merge "Remove dead code." 
* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
  Remove dead code.
 2014-03-07 22:59:37 +00:00
Chris Wren d30905cab0 Merge "jdk error message should not mention the version" 2014-03-07 20:45:56 +00:00
Ben Cheng 45df929d07 am 585fa32d: am 395ae92a: am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now." 
* commit '585fa32d7ee6bbe40b4aae130e6b0ceb711596fe':
  OProfile is no longer compiled now.
 2014-03-07 20:33:22 +00:00
Chris Wren 1f11575b7c jdk error message should not mention the version 
the version is checked elsewhere

Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
 2014-03-07 15:21:08 -05:00
Ying Wang dcbe985a6d am f9538ea6: Merge "Add missing s to mips." 
* commit 'f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
  Add missing $(combo_2nd_arch_prefix)s to mips.
 2014-03-07 19:41:11 +00:00
Ying Wang 0ee468fe30 am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build" 
* commit '5aa50c6637f88213661b29facaf05f072316dec0':
  Fix x86 config file to support 2nd ARCH build
 2014-03-07 19:40:41 +00:00
Ying Wang 5f6fa379bc am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8" 
* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
  Switch x86_64 to gcc-4.8
 2014-03-07 19:40:40 +00:00