Commit Graph

3559 Commits

Author SHA1 Message Date
Ying Wang 7b66d366bf Call "java[c] -version" only once
and print out the full output if error occurs.
Bug: 11672548

Change-Id: Iba217789f7ab69d73902a4dc82e8975b2f6a48fc
2013-11-13 15:05:15 -08:00
Yohann Roussel 270be79007 Merge "Move multidex support library" 2013-11-13 15:22:34 +00:00
Elliott Hughes 06659afcdf am 693a26ba: am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '693a26ba5599b84a3ae2a4b309e22be8a61ba3b0':
  Switch x86_64 over to uapi headers.
2013-11-08 14:56:24 -08:00
Elliott Hughes 693a26ba55 am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
  Switch x86_64 over to uapi headers.
2013-11-08 14:54:12 -08:00
Elliott Hughes f8c5a6ae00 am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'bd10e2c019b9f6a6e13f050c0e52924f456e482f':
  Switch x86_64 over to uapi headers.
2013-11-08 14:52:30 -08:00
Elliott Hughes bd10e2c019 Merge "Switch x86_64 over to uapi headers." 2013-11-08 22:50:55 +00:00
Elliott Hughes 600b973722 Switch x86_64 over to uapi headers.
Bug: 11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
2013-11-08 14:47:10 -08:00
Raphael Moll 6f1f97d970 am e9966aab: am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit 'e9966aab80e74d0a06c4ab6734a5996d8cb69604':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:42:20 -08:00
Raphael Moll e9966aab80 am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '79a9a3243ae701e7bc40b85b4a085ad91821d921':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:38:54 -08:00
Raphael Moll 79a9a3243a am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:36:17 -08:00
Raphael Moll b9c20aa8ba Windows SDK: define BEGIN_DECLS/END_DECLS.
These macros are not provided by MingW by default.

Change-Id: I623fda6c8e25e26573543c9368ebad47abc7f5c3
2013-11-08 11:40:41 -08:00
Michael Runge c5d3cb362c am 3b44339d: am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '3b44339d6a443fde57db4ae84a7e46823da6d162':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 16:13:15 -08:00
Maurice Chu 664035f771 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
2013-11-08 00:09:14 +01:00
Michael Runge 3b44339d6a am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '37335b42385970d957d48056145a3d4c4dbc6087':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
Michael Runge 37335b4238 Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
2013-11-07 11:36:03 -08:00
Brian Carlstrom 9efa0e19b0 Merge "Add support for instruction set features" 2013-11-07 18:32:17 +00:00
Elliott Hughes 2773ab94d7 am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
* commit '36e681b02a7cd2554f038bcac65d7fdfc7889273':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 09:44:31 -08:00
Elliott Hughes 36e681b02a resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Dave Allison 5174bb0529 Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images.  The feature set is determined at
build time

(cherry picked from commit 4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)

Change-Id: I7f1ab44a561e24ad21ff8abe9b7636e04f833e0e
2013-11-07 09:04:21 -08:00
Elliott Hughes 12f87a5b77 am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 08:35:17 -08:00
Narayan Kamath 4c2255c320 Merge "Rework the generation of host java libraries." 2013-11-07 16:22:10 +00:00
Narayan Kamath c586c580ba Merge "Add experimental flag to support OpenJDK builds." 2013-11-07 15:29:09 +00:00
Narayan Kamath 0dd273a3f6 Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.

BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.

This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.

bug: 8992787

Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
2013-11-07 09:39:05 +00:00
Narayan Kamath 060e8f5099 Merge "Fix droiddoc generation." 2013-11-06 16:28:43 +00:00
Elliott Hughes c87c30a272 am 92303c47: am e19ebfee: am a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '92303c47b94b32cf5aa5ae1119cb32d3d4c6fa94':
  Remove shell_ash; ash is but ashes.
2013-11-05 13:00:59 -08:00
Elliott Hughes 32bfd70333 Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
2013-11-05 11:13:49 -08:00
Elliott Hughes 92303c47b9 am e19ebfee: am a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit 'e19ebfee3cede975d0dce0b0badf1251c44ec453':
  Remove shell_ash; ash is but ashes.
2013-11-05 10:35:26 -08:00
Elliott Hughes e19ebfee3c am a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit 'a7f254feb77db5a1358be869c39757eab487bbde':
  Remove shell_ash; ash is but ashes.
2013-11-05 10:30:03 -08:00
Elliott Hughes 17753f5c6a Remove shell_ash; ash is but ashes.
Change-Id: I88040e39c51986b14e3a764e7bb9e2c8c05ed86b
2013-11-05 09:05:50 -08:00
Ben Cheng d63743f320 am 0ad7a371: am d16a4913: am 48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '0ad7a3715036e70e303eb8c2e3d480b134e8a870':
  AArch64: Enable AArch64 support
2013-10-30 10:36:07 -07:00
Ben Cheng 0ad7a37150 am d16a4913: am 48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit 'd16a49134914eec45f395c867f9e8e282009fffe':
  AArch64: Enable AArch64 support
2013-10-30 10:33:24 -07:00
Ben Cheng d16a491349 am 48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '48c4bac05f86b712f40b3a2f7dd846ed8f5eb0a4':
  AArch64: Enable AArch64 support
2013-10-30 10:30:42 -07:00
Ben Cheng 74a8faf233 AArch64: Enable AArch64 support
This patch completes the support for AArch64. It adds the last few
tweaks that will enable a AArch64 build of bionic.

Please note that though AArch64 uses the new kernel infrastructure,
where the userspace exported headers live in uapi folders, we still
need to include "kernel/common" in the include search path
(take a look at external/kernel-headers/uapi/asm-generic/signal-defs.h).

Also remove the relro linker flags for now as they crash the foundation
model.

Change-Id: Ie2fa8c1056c84dc15fec4469f2d65b8d0c5e712b
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2013-10-29 16:15:40 -07:00
Ying Wang d1dbe7f5a2 Add experimental flag to support OpenJDK builds.
bug: 8992787

Change-Id: Ice0fc7dea1d855914fdab9a01b1ac9c722031288
2013-10-28 19:09:28 +00:00
Ben Cheng 2972ab341f am 281778a3: am 72e9dab0: am 7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '281778a373f5034195bda7c652e353770dae8242':
  Add the search path for libgcc.a and crt*.o.
2013-10-28 10:57:40 -07:00
Ben Cheng 281778a373 am 72e9dab0: am 7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '72e9dab0127e4200d5770d0fa7944fc0db29632b':
  Add the search path for libgcc.a and crt*.o.
2013-10-28 10:52:52 -07:00
Ben Cheng 72e9dab012 am 7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '7b954f4c77aa49633caac196dd9343775d05e81a':
  Add the search path for libgcc.a and crt*.o.
2013-10-28 10:48:10 -07:00
Ben Cheng 71c36eb451 Add the search path for libgcc.a and crt*.o.
Change-Id: I727f5630f7667b98770d779d43be6a7901471c55
2013-10-28 10:33:55 -07:00
Ben Cheng 30e5c468b9 am 4f2abfff: am 24834ffd: am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '4f2abfff484db165335fc3922ca692d846d93177':
  Two quick fixes: fix kernel header location and nostdlib.
2013-10-25 18:16:25 -07:00
Ben Cheng 4f2abfff48 am 24834ffd: am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '24834ffddd64f80c93089033c214f0996c2f18c6':
  Two quick fixes: fix kernel header location and nostdlib.
2013-10-25 18:13:14 -07:00
Ben Cheng 24834ffddd am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '4f92abad95f724c0bf29c93d6b1c8fff41049007':
  Two quick fixes: fix kernel header location and nostdlib.
2013-10-25 16:11:34 -07:00
Ben Cheng 4f92abad95 Merge "Two quick fixes: fix kernel header location and nostdlib." 2013-10-25 16:36:40 +00:00
Ben Cheng e61dea99c3 Two quick fixes: fix kernel header location and nostdlib.
Change-Id: Idf2d101e16e895ca75a74a095091e3543b2b482b
2013-10-25 09:34:29 -07:00
Narayan Kamath da3fec9be3 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
2013-10-25 17:26:40 +01:00
Nick Kralevich f9d986b549 am 3ee5710d: am 0f798297: am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '3ee5710d69c9141ff72de5b67fc33cd7825346f2':
  x86: turn on -Wl,--fatal-warnings
2013-10-24 14:42:26 -07:00
Nick Kralevich 3ee5710d69 am 0f798297: am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '0f798297636ea07f1a87412776d48a57888ea8fe':
  x86: turn on -Wl,--fatal-warnings
2013-10-24 14:40:00 -07:00
Nick Kralevich 0f79829763 am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '8c4efac588d695b11ed341a0e4531d3e220dbe8c':
  x86: turn on -Wl,--fatal-warnings
2013-10-24 14:36:38 -07:00
Nick Kralevich 46ed4aa58b x86: turn on -Wl,--fatal-warnings
In 4f2f16da14, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation.  At the time, we wrote:

=====
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.

This warning will turn into an error in a future change
(via --fatal-warnings)
=====

All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.

Enable --fatal-warnings.

Bug: 11353056
Change-Id: I2f2c65352166ef0a96f54858de1556f0290fe306
2013-10-24 13:36:08 -07:00
Colin Cross ae517353ea am 2df0464a: am a2ccae25: Merge "avoid // in copy headers rule" into klp-dev
* commit '2df0464a54c1a4c2fca5814b07ee6d588617f2c4':
  avoid // in copy headers rule
2013-10-24 11:42:32 -07:00
Colin Cross 2df0464a54 am a2ccae25: Merge "avoid // in copy headers rule" into klp-dev
* commit 'a2ccae2546db082e571168650b279125bfceb861':
  avoid // in copy headers rule
2013-10-23 18:30:02 -07:00