Commit graph

5810 commits

Author SHA1 Message Date
Yabin Cui
57ed1ddf78 Merge "kill HAVE_TERMIO_H" 2014-11-18 03:40:34 +00:00
Dan Albert
9b0ccb7480 Merge "Fix the libgcc/libatomic link order." 2014-11-17 23:55:57 +00:00
Yabin Cui
a16825ff7a kill HAVE_TERMIO_H
Bug: 18398307
Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
2014-11-17 14:49:39 -08:00
Miao Wang
ec64b05e9d Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib." 2014-11-17 21:25:24 +00:00
Dan Albert
f63ca1e9ea Merge "Disable gnu style linker hash for NDK builds." 2014-11-17 20:29:43 +00:00
Ying Wang
0c9b3bac65 Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.

Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-17 11:26:29 -08:00
Dan Albert
8df7653d56 Merge "Remove logic for platform stlport gtest." 2014-11-15 23:42:15 +00:00
Miao Wang
e23e8080c6 Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
Bug 18395015

Change-Id: Ib9aecf347c685c8b8b725eecfbc0cec03d9b2c1b
2014-11-15 14:25:33 -08:00
Dan Albert
d3d894da74 Disable gnu style linker hash for NDK builds.
This feature is now available in AOSP, but not for any shipped
release. We don't have an API version for the release that this will
be available in yet, so for now the check is commented out.

Bug: 18395015
Change-Id: I247233d047ed5a7564d6602d47c9ad962313c8dc
2014-11-15 01:50:52 +00:00
Dan Albert
a05a04cc75 Merge "Refactor transform-o-to-* definitions." 2014-11-14 18:01:21 +00:00
Dan Albert
741b36e922 Fix the libgcc/libatomic link order.
The previous position of libgcc.a/libatomic.a on the link line causes
the linker to prefer satisfying dependencies from these libraries from
other libraries that might include them, rather than from libgcc.a (or
libatomic.a) itself. This imposes an ABI requirement that those
intermediate shared libraries _always_ export those symbols, which is
undesirable.

Change-Id: Ib593236b475d3e98356b2b1be6f96cee2b67378f
2014-11-13 21:29:28 -08:00
Dmitriy Ivanov
3537692df3 Merge "Switch --hash-style to gnu" 2014-11-14 01:47:00 +00:00
Ian Rogers
93efec89e0 Merge "Pass instruction set variant to dex2oat." 2014-11-14 00:21:52 +00:00
Dan Albert
e088c0d281 Refactor transform-o-to-* definitions.
Previously, there was one generic definition for each of the
transform-o-to-* functions in definitions.mk, and one target specific
one in each combo/TARGET_*.mk. The generic one was entirely unused,
and the target specific ones were all nearly identical.

Changing anything in these functions was tedious at best, and often
error prone. The differences between any 32-bit arch and its 64-bit
equivalent were restricted to the name of the linker, and the ARM and
MIPS definitions were identical. The few differences between ARM and
x86 looked to be compatibility for an old (ca. 2008) toolchain issue
with --gc-sections, and a bug (LDFLAGS coming first rather than
later).

To simplify things, I've moved the definitions for these out of
combo/TARGET_*.mk and back into definitions.mk. The differences
between ARM and x86 have been scrapped. Anything that really does
still need to be target specific can be handled as I have the linker:
add a TARGET_FOO variable to the given target and then add it to the
generic definition.

Change-Id: I54dc1bffc32ac39f27f0b87247dd6a6dbaf0b162
2014-11-13 16:21:46 -08:00
Yabin Cui
eddd9fb03f Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:46 +00:00
Dmitriy Ivanov
179685c1c3 Switch --hash-style to gnu
Bug: 18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
2014-11-13 14:51:10 -08:00
Yabin Cui
e9ae59b47f kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
2014-11-13 11:51:37 -08:00
Yabin Cui
19230103ee kill HAVE_GETHOSTBYNAME_R
Bug: 18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
2014-11-13 10:25:56 -08:00
Elliott Hughes
0e3a0fcb95 Remove HAVE_SHORT_ENUMS.
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
2014-11-12 21:07:07 -08:00
Yabin Cui
e9680c2212 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
2014-11-12 17:15:30 -08:00
Yabin Cui
957037dc40 Merge "kill HAVE_POSIX_FILEMAP" 2014-11-13 00:02:25 +00:00
Chih-Hung Hsieh
aea83e0dca Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 2014-11-12 23:13:36 +00:00
Dan Albert
8914f71cc0 Remove logic for platform stlport gtest.
Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).

Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.

Bug: 15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
2014-11-11 17:45:45 -08: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
Yabin Cui
3b9d876f93 kill HAVE_POSIX_FILEMAP
Bug: 18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
2014-11-11 10:34:37 -08:00
Elliott Hughes
b389394361 Merge "Remove unused variables from select.mk." 2014-11-11 17:59:17 +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
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
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
Ian Rogers
a18a28305d Pass instruction set variant to dex2oat.
Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890

Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
2014-11-08 17:07:23 -08:00
Elliott Hughes
89ac6e4c6f Remove more namespace pollution (HAVE_TM_GMTOFF).
Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
2014-11-08 14:21:12 -08: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
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
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
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