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
3342bf0fea
Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
2013-11-08 21:33:58 +00:00
Ed Heyl
5b684e9972
merge in release branch changes (no-op).
2013-11-08 13:23:43 -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
Jeff Brown
6bc714810b
am c4c92f1c: am e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'c4c92f1c73933ed98205409d23e5e71e631c03e1':
Add a platform library for remote display providers.
2013-11-07 17:47:17 -08:00
Jeff Brown
c4c92f1c73
am e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'e17927e0859778638781d75e33a3d4c5184583c4':
Add a platform library for remote display providers.
2013-11-07 17:44:06 -08:00
Jeff Brown
e17927e085
Merge "Add a platform library for remote display providers." into klp-dev
2013-11-08 01:37:12 +00:00
The Android Automerger
626fee479e
"KOT38C"
2013-11-07 17:04:53 -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
The Android Automerger
c2200d9a37
"KOT38B"
2013-11-07 14:40:43 -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
Elliott Hughes
a05365cece
Merge "Remove the hacks needed to support ash and mksh concurrently."
2013-11-07 16:07:32 +00:00
Narayan Kamath
c586c580ba
Merge "Add experimental flag to support OpenJDK builds."
2013-11-07 15:29:09 +00:00
The Android Automerger
33fff9d4e0
"KOT38"
2013-11-07 06:02:30 -08:00
The Android Automerger
8f163e89ba
merge in klp-mr1-release history after reset to klp-dev
2013-11-07 06:00:31 -08: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
Nick Kralevich
3729bace05
am 8eec26e2: am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '8eec26e2765d6e83f8509beb610caef936a11a35':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:15:43 -08:00
Nick Kralevich
8eec26e276
am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '7717bcba28ce55bac10f6586feff89da569ff62b':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:10:16 -08:00
Nick Kralevich
7717bcba28
am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '240cd127eb0a14515b37b2e691645a1e83ab31f9':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:02:06 -08:00
Nick Kralevich
240cd127eb
Merge "Move goldfish-specific policy rules to their own directory."
2013-11-06 23:58:09 +00:00
The Android Automerger
357d3f99e0
"KOT37B"
2013-11-06 15:14:20 -08:00
Narayan Kamath
060e8f5099
Merge "Fix droiddoc generation."
2013-11-06 16:28:43 +00:00
Stephen Smalley
1d5352eaa3
Move goldfish-specific policy rules to their own directory.
...
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-06 10:24:14 -05:00
The Android Automerger
21c385a3b4
"KOT37"
2013-11-06 06:02:35 -08:00
The Android Automerger
a8011a2342
merge in klp-mr1-release history after reset to klp-dev
2013-11-06 06:00:25 -08:00
Jeff Brown
2cbae109be
Add a platform library for remote display providers.
...
Bug: 11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
2013-11-05 22:17:57 -08: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
a7f254feb7
Merge "Remove shell_ash; ash is but ashes."
2013-11-05 18:01:25 +00:00
Elliott Hughes
17753f5c6a
Remove shell_ash; ash is but ashes.
...
Change-Id: I88040e39c51986b14e3a764e7bb9e2c8c05ed86b
2013-11-05 09:05:50 -08:00
The Android Automerger
a4ca785f4a
"KOT36"
2013-11-05 06:05:13 -08:00
The Android Automerger
6a54ed4214
merge in klp-mr1-release history after reset to klp-dev
2013-11-05 06:03:41 -08:00
The Android Automerger
fbc20a9bec
"KOT35B"
2013-11-04 14:43:58 -08:00
The Android Automerger
23d14d8bef
"KOT35"
2013-11-04 06:02:25 -08:00
The Android Automerger
606c2f143d
merge in klp-mr1-release history after reset to klp-dev
2013-11-04 06:00:28 -08:00
The Android Automerger
946717af04
KOT31C
2013-11-03 17:59:15 -08:00
The Android Automerger
6e56ac642e
"KOT31B"
2013-11-01 12:58:12 -07:00
The Android Automerger
fdcdd452eb
"KOT32"
2013-11-01 12:57:01 -07:00
Scott Main
641c2c2fda
clarify the hidden APIs in reference with better tooltips
...
Change-Id: Iaa843b4a0462195084fb7a35e826eeec92d50c64
2013-10-31 14:48:45 -07:00