Dan Albert
201f6b3e92
Merge "Make modules depend on their makefile."
2014-11-11 22:47:47 +00:00
Dan Albert
954b5bdcf4
Make modules depend on their makefile.
...
This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.
Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
2014-11-11 14:30:54 -08:00
Dan Albert
1f6371583e
Merge "Use platform protobuf unless building with NDK."
2014-11-11 19:28:34 +00:00
Dan Albert
c3031c70f7
Use platform protobuf unless building with NDK.
...
The NDK protobuf library depends on the final target linking stlport
(since it is a static library). Since the platform stlport is going
away, we need to use a separate version of the protobuf library that
is compiled for the platform against libc++.
Note that this should be the case for _all_ libraries built with the
NDK. If a library needs to be used by both an NDK built final target
and a platform built final target, there should be both an NDK and
platform version of the library.
Bug: 15193147
Change-Id: I0ead61c2d1cd9d0248b304ab7d8682dedd6e8366
2014-11-11 11:05:27 -08:00
Elliott Hughes
b389394361
Merge "Remove unused variables from select.mk."
2014-11-11 17:59:17 +00:00
Yabin Cui
4dc8e8561f
Merge "remove __linux__ in AndroidConfig.h"
2014-11-11 17:32:34 +00:00
Elliott Hughes
a3850a976c
Remove unused variables from select.mk.
...
I've no idea what these were meant to be for, but they're unused.
Change-Id: I978568bd83f91eb952c35a3a481bd517312062f0
2014-11-10 20:47:49 -08:00
Yabin Cui
70af4d3796
remove __linux__ in AndroidConfig.h
...
Bug: 18316409
Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3
2014-11-10 19:14:56 -08:00
Yabin Cui
8659634285
Merge "kill OS_CASE_SENSITIVE"
2014-11-11 01:08:46 +00:00
Yabin Cui
d8e38e1b1a
Merge "kill HAVE_INOTIFY"
2014-11-11 00:11:04 +00:00
Yabin Cui
3dbac214c2
Merge "kill HAVE_STAT_ST_MTIM"
2014-11-11 00:04:35 +00:00
Elliott Hughes
83da486c37
Merge "Remove HAVE_DIRENT_D_TYPE."
2014-11-10 23:57:09 +00:00
Yabin Cui
e8e5e99b76
kill HAVE_INOTIFY
...
Bug: 18314841
Change-Id: Idfcbeb62a57f72a47eb732f085fbd1ab27302f85
2014-11-10 15:44:27 -08:00
Elliott Hughes
07793e1880
Remove HAVE_DIRENT_D_TYPE.
...
Only Windows doesn't have it, and we don't build atree for Windows.
Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
2014-11-10 15:33:39 -08:00
Yabin Cui
4120e835fb
kill HAVE_STAT_ST_MTIM
...
Bug: 18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
2014-11-10 15:27:49 -08:00
Yabin Cui
772034bc95
kill OS_CASE_SENSITIVE
...
Bug: 18314594
Change-Id: I5dc5072d43299c0e5d96ce9640e8405cbb633506
2014-11-10 15:03:11 -08:00
Yabin Cui
1036850f8f
Merge "kill HAVE_SCHED_SETSCHEDULER"
2014-11-10 22:22:44 +00:00
Yabin Cui
35e8e323bc
kill HAVE_SCHED_SETSCHEDULER
...
Bug: 18300670
Change-Id: I66fb3d0070751ffaa2bc6b53274b22d967350312
2014-11-10 12:20:15 -08:00
Dan Albert
fb5f41779e
Merge "Remove logic for libstdc++ gtest libs."
2014-11-10 19:22:10 +00:00
Dan Albert
ea93ae61e3
Remove logic for libstdc++ gtest libs.
...
The libstdc++ linked gtest libraries are no longer necessary.
Change-Id: Ia98263bc2541b6c8fd0b3e22bb6fec85104a2210
2014-11-09 00:55:25 -08:00
Elliott Hughes
652ff716b8
Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."
2014-11-08 23:31:19 +00:00
Elliott Hughes
89ac6e4c6f
Remove more namespace pollution (HAVE_TM_GMTOFF).
...
Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
2014-11-08 14:21:12 -08:00
Elliott Hughes
3581753ffa
Merge "Remove more namespace pollution (HAVE_FUNOPEN)."
2014-11-08 22:10:03 +00:00
Elliott Hughes
e5e26e2196
Remove more namespace pollution (HAVE_FUNOPEN).
...
Change-Id: I25a64ce39cd7bdd99aa6412413554b96d3cb113e
2014-11-08 12:39:28 -08:00
Elliott Hughes
9e95a0f4d0
Merge "Remove more namespace pollution."
2014-11-08 18:55:53 +00:00
Elliott Hughes
b63a7c0dd9
Remove more namespace pollution.
...
Nothing in our tree is using this HAVE_BACKTRACE definition, but we do have
a hack in external/llvm to work around the namespace pollution.
Change-Id: Ib51d8bbd598dd2961a028216bf0b489dc7ad4880
2014-11-08 10:14:19 -08:00
Dan Albert
ebc320900c
Merge "Cleanspec for libc++ migration."
2014-11-07 22:09:18 +00:00
Dan Albert
c52eba1fa2
Merge "Make libc++ the default STL."
2014-11-07 22:09:14 +00:00
Dan Albert
7337a822a8
Cleanspec for libc++ migration.
...
This affects most native code in the tree, so the only real option is
to nuke out from orbit.
Change-Id: Ia3a794731e703c3ca02b55f6f7827d3425dca5cb
2014-11-07 13:24:56 -08:00
Dan Albert
93766b28ce
Make libc++ the default STL.
...
Previously, code defaulted to using libstdc++ (which was GNU libstdc++
on the host, or Bionic's "libstdc++" on the target). Now we default to
libc++. The exception for this is when using mingw, because we cannot
build libc++ for mingw.
Change-Id: I68726fa26cdcb6263f17c838d3e859debd57fae1
2014-11-07 13:24:56 -08:00
Ying Wang
87bde62df4
Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."
2014-11-07 18:06:56 +00:00
Ying Wang
2ad87ebf26
Fix error of PRIVATE_LDLIBS introduced by de36cd72
.
...
Change-Id: I85644899c8527e061c331eecc707ca1bb0e3fac4
2014-11-07 10:05:03 -08:00
Dan Albert
18e6b28001
Merge "Missed a dependency on pthreads."
2014-11-07 17:35:26 +00:00
Ying Wang
73b4d38b53
Merge "Update build ID to AOSP"
2014-11-07 17:22:11 +00:00
Chirayu Desai
9a1f47c7c6
Update build ID to AOSP
...
and display the build number
Change-Id: Ib2f9964b87f591cae235e5094a7f14c897c1872d
2014-11-07 16:10:17 +05:30
Dan Albert
5cab04ffd2
Missed a dependency on pthreads.
...
Change-Id: I060c9c65b07efe89a308fccf71a1096424a7de39
2014-11-06 17:32:25 -08:00
Ying Wang
a69e59623b
am 478eda53
: Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT."
...
* commit '478eda5365f866c830f957d6bd1aba3854d55bcc':
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
2014-11-07 00:58:32 +00:00
Ying Wang
478eda5365
Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT."
2014-11-06 23:09:25 +00:00
Ying Wang
e5d4e74f9f
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
...
Because we don't have 32-bit prebuilt libLLVM/libclang.
Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
2014-11-06 14:11:33 -08:00
Daniel Cashman
1cffe21979
am b0efa98d
: Merge "Switch qemud to permissive_or_unconfined()."
...
* commit 'b0efa98d97c04f4f97f57aae954aa61cb14683fe':
Switch qemud to permissive_or_unconfined().
2014-11-06 19:22:01 +00:00
Daniel Cashman
b0efa98d97
Merge "Switch qemud to permissive_or_unconfined()."
2014-11-06 18:50:40 +00:00
Stephen Smalley
82b6f21be3
Switch qemud to permissive_or_unconfined().
...
Switch the qemud domain from unconfined_domain() to
permissive_or_unconfined() so that we can start collecting and
addressing denials in -userdebug/-eng builds.
Also allow access to the serial device.
Change-Id: I9c7a6ddc8c2e64bfc6c5bb896eed1729ab205d60
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov >
2014-11-06 09:36:40 -05:00
Ian Rogers
b78348d5b4
am 5968de73
: Merge "Remove stale dexopt flags."
...
* commit '5968de73fb78e2ca8f32ab0588cac92f74a0435e':
Remove stale dexopt flags.
2014-11-06 00:05:36 +00:00
Ian Rogers
5968de73fb
Merge "Remove stale dexopt flags."
2014-11-05 23:21:41 +00:00
Ian Rogers
9c7fc4b325
Remove stale dexopt flags.
...
Change-Id: Ib58d39012eabd5f854b9434ab922340fcfe43b57
2014-11-05 14:53:53 -08:00
Ying Wang
9aad363e8d
am 7a301af1
: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11"
...
* commit '7a301af1e0a3d590e42d3317940e65f739b9f930':
Force colorsheme to SVG, since darkblue doesn't exist on X11
2014-11-05 19:01:48 +00:00
Ying Wang
b45f7c35b1
am 8683612f
: Merge "definitions.mk: look for definitions.mk in device/*/build also"
...
* commit '8683612fbd15640ae59daf7ba7c36e1f2ff8e687':
definitions.mk: look for definitions.mk in device/*/build also
2014-11-05 19:01:47 +00:00
Ying Wang
7a301af1e0
Merge "Force colorsheme to SVG, since darkblue doesn't exist on X11"
2014-11-05 18:36:36 +00:00
Ying Wang
8683612fbd
Merge "definitions.mk: look for definitions.mk in device/*/build also"
2014-11-05 17:50:00 +00:00
Stephen Hines
f1c5dd60b2
am 35e4ede5
: Merge "Use automatic color option with the latest clang."
...
* commit '35e4ede5974053d05ae0f8791e60ba77a31907b3':
Use automatic color option with the latest clang.
2014-11-04 17:44:44 +00:00