OSDN Git Service
Stephen Hines [Tue, 2 Dec 2014 19:25:18 +0000 (19:25 +0000)]
Merge "Fix a preprocessor warning exposed by -Wundef."
Stephen Hines [Tue, 2 Dec 2014 19:17:07 +0000 (11:17 -0800)]
Fix a preprocessor warning exposed by -Wundef.
Bug:
18589470
__LP64__ is only defined for 64-bit compilation targets, so this macro
is evaluated as an implicit 0 in the original case. This change makes
it explicit that we only care whether this is actually defined.
Change-Id: I8c11b41fc0bde9477c5efeea0782d9741d9d827d
Elliott Hughes [Tue, 2 Dec 2014 18:42:23 +0000 (18:42 +0000)]
Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
Stephen Hines [Tue, 2 Dec 2014 18:35:17 +0000 (18:35 +0000)]
Merge "Add more support for GLOBAL_CONLYFLAGS."
Ying Wang [Tue, 2 Dec 2014 17:31:44 +0000 (17:31 +0000)]
Merge "Don't set up the prebuilt apk rule twice."
Elliott Hughes [Tue, 2 Dec 2014 04:53:11 +0000 (20:53 -0800)]
Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
Ying Wang [Mon, 1 Dec 2014 23:56:19 +0000 (15:56 -0800)]
Don't set up the prebuilt apk rule twice.
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.
Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
Stephen Hines [Wed, 26 Nov 2014 08:53:46 +0000 (00:53 -0800)]
Add more support for GLOBAL_CONLYFLAGS.
This will be necessary to support -std=gnu99 mode for clang 3.6, which
defaults to C11 mode (unlike prior releases that use C99).
Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
Dan Albert [Mon, 1 Dec 2014 17:59:44 +0000 (17:59 +0000)]
Merge "Fix a typo in my_cppflags assignment."
Dan Albert [Fri, 28 Nov 2014 22:00:12 +0000 (14:00 -0800)]
Fix a typo in my_cppflags assignment.
Make strikes once again...
Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
Elliott Hughes [Wed, 26 Nov 2014 00:15:36 +0000 (00:15 +0000)]
Merge "Remove HAVE_SYS_UIO_H."
Elliott Hughes [Tue, 25 Nov 2014 21:59:21 +0000 (13:59 -0800)]
Remove HAVE_SYS_UIO_H.
Change-Id: I4f401900285e166486bb426ac02bc69fc5509a3c
Elliott Hughes [Tue, 25 Nov 2014 21:15:56 +0000 (21:15 +0000)]
Merge "Remove unused HAVE_STDBOOL_H."
Elliott Hughes [Tue, 25 Nov 2014 20:22:43 +0000 (12:22 -0800)]
Remove unused HAVE_STDBOOL_H.
Change-Id: I0072847719566e9622ec9765673fdeb8be9eb5ef
Dan Albert [Tue, 25 Nov 2014 18:36:04 +0000 (18:36 +0000)]
Merge "Make gnu++11 the default standard version."
Elliott Hughes [Tue, 25 Nov 2014 18:35:46 +0000 (18:35 +0000)]
Merge "Kill unused HAVE_WRITEV."
Elliott Hughes [Tue, 25 Nov 2014 18:30:55 +0000 (10:30 -0800)]
Kill unused HAVE_WRITEV.
Change-Id: I6e4df2449b27d67f207fc53b19e49b21f9cee611
Nicolas Geoffray [Tue, 25 Nov 2014 14:22:36 +0000 (14:22 +0000)]
Merge "Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk""
Nicolas Geoffray [Tue, 25 Nov 2014 12:52:26 +0000 (12:52 +0000)]
Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
This breaks our build-art-host and build-art-target. I think we need to rewrite those rules as well.
This reverts commit
29f0a487b05f87cc3a6c9fbb7e7ae885064e27be.
Change-Id: I2e6674e01a2042e9d53e28ecd3e6bdf76fa806a3
Dan Albert [Tue, 9 Sep 2014 02:06:04 +0000 (19:06 -0700)]
Make gnu++11 the default standard version.
There are a _lot_ of users of `typeof` in the tree, and they'll need a
GNU flavored standard. Rather than fixing up all of these
individually, let's just use gnu++11 as the default.
Bug:
18466763
Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
Ying Wang [Mon, 24 Nov 2014 23:48:44 +0000 (23:48 +0000)]
Merge "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
Ying Wang [Mon, 24 Nov 2014 23:44:39 +0000 (15:44 -0800)]
Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
Change-Id: I4a2827b2cdbb0bf5a8ca960561fbe17cc80cc275
Elliott Hughes [Mon, 24 Nov 2014 18:07:55 +0000 (18:07 +0000)]
Merge "Remove TARGET_CPU_SMP."
Serban Constantinescu [Fri, 21 Nov 2014 17:28:33 +0000 (17:28 +0000)]
Remove TARGET_CPU_SMP.
There are no more users of TARGET_CPU_SMP in the current codebase.
Expert users should set "-smp" in DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES
for targets that run on a single-core CPU.
Change-Id: Ib94865f05a92c9a4622540cebc18ded4bdfa6363
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Elliott Hughes [Sun, 23 Nov 2014 17:47:49 +0000 (17:47 +0000)]
Merge "Ensure the base system includes toybox."
Elliott Hughes [Sun, 23 Nov 2014 07:13:40 +0000 (23:13 -0800)]
Ensure the base system includes toybox.
Change-Id: I0eec19328855d67da1c574a88b452f0eeec6adc7
Dan Albert [Sat, 22 Nov 2014 20:48:44 +0000 (20:48 +0000)]
Merge "Make cgrep check .hpp files as well."
Dan Albert [Sat, 22 Nov 2014 18:16:01 +0000 (10:16 -0800)]
Make cgrep check .hpp files as well.
Change-Id: Ie8e9ce7270233ac01d7bc80bda5adc28afa158ed
Elliott Hughes [Sat, 22 Nov 2014 08:06:10 +0000 (08:06 +0000)]
Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:55:26 +0000 (23:55 -0800)]
Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: Ie596af7460ec33d70d7327e629b38d641ef48ba2
Elliott Hughes [Sat, 22 Nov 2014 07:52:42 +0000 (07:52 +0000)]
Merge "Kill LOCAL_SOCKET_NAMESPACE."
Elliott Hughes [Sat, 22 Nov 2014 06:54:28 +0000 (22:54 -0800)]
Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I40c63b8e7ae1174ac902b545555ddab65b3fef38
Dan Albert [Thu, 20 Nov 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Revert "Fix the libgcc/libatomic link order.""
Dan Albert [Thu, 20 Nov 2014 22:48:50 +0000 (14:48 -0800)]
Revert "Fix the libgcc/libatomic link order."
This caused a lot of failures in the libc++ tests, since linking
libgcc.a before libc++.so means that the wrong unwinder will be used.
This patch is still correct, but I will revert for now while I find a
good way to apply it without breaking unwinding.
This reverts commit
741b36e922a09c47507b61cbfc9cd8bba029f476.
Change-Id: I57e0b89534adf5c1677dbf2f64ac750e74bd5fbf
Elliott Hughes [Thu, 20 Nov 2014 21:03:29 +0000 (21:03 +0000)]
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
Elliott Hughes [Thu, 20 Nov 2014 20:58:26 +0000 (12:58 -0800)]
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: If3ff83c475921d72936a19317e356549d1706fab
Ying Wang [Thu, 20 Nov 2014 17:18:36 +0000 (17:18 +0000)]
Merge "Fix building on modern versions of Xcode and OS X."
Ying Wang [Thu, 20 Nov 2014 17:17:54 +0000 (17:17 +0000)]
Merge "arm: Support qemu-android on generic arm targets"
Yabin Cui [Thu, 20 Nov 2014 05:15:14 +0000 (05:15 +0000)]
Merge "kill HAVE_PREAD"
Yabin Cui [Thu, 20 Nov 2014 04:48:36 +0000 (20:48 -0800)]
kill HAVE_PREAD
Bug:
18397613
Change-Id: I0061f8080709449f13dc76ce61097a2671c799ff
Christoffer Dall [Mon, 27 Oct 2014 18:53:24 +0000 (19:53 +0100)]
arm: Support qemu-android on generic arm targets
When building a generic arm 32-bit target, we also want to include
support for the ranchu board model for the updated Android emulator
based on recent upstream QEMU.
Since the emulator.mk file is included by both the generic and
generic_arm64 targets and already defines a PRODUCT_COPY_FILES and
PRODUCT_PACKAGES, move duplicate entries from
target/board/generic*/device.mk to target/product/emulator.mk.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
Ying Wang [Wed, 19 Nov 2014 18:53:18 +0000 (18:53 +0000)]
Merge "Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list"
Yabin Cui [Wed, 19 Nov 2014 04:26:19 +0000 (04:26 +0000)]
Merge "kill HAVE_MADVISE"
Yabin Cui [Wed, 19 Nov 2014 02:14:37 +0000 (18:14 -0800)]
kill HAVE_MADVISE
Bug:
18397020
Change-Id: I6b9c7d30432858131379759e738d3e04bc8d5fb5
Andreas Gampe [Tue, 18 Nov 2014 23:31:49 +0000 (23:31 +0000)]
Merge "Build: Support for compiled-classes file"
Andreas Gampe [Tue, 18 Nov 2014 19:45:10 +0000 (11:45 -0800)]
Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.
Bug:
18410571
(cherry picked from commit
4fec0bb265ac8cdbe883b8868abfcb56713db170)
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
Andreas Gampe [Tue, 18 Nov 2014 23:08:16 +0000 (23:08 +0000)]
Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
Igor Murashkin [Thu, 30 Oct 2014 23:08:07 +0000 (16:08 -0700)]
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.
This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.
Bug:
18035729
(cherry picked from commit
da9f1a7e82b7e6d0677553f211835625078347f2)
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
Elliott Hughes [Tue, 18 Nov 2014 22:15:25 +0000 (22:15 +0000)]
Merge "Remove another unused definition."
Elliott Hughes [Tue, 18 Nov 2014 22:10:27 +0000 (14:10 -0800)]
Remove another unused definition.
We have a lot of definitions around the tree, of which this is but one,
but we have no users.
Change-Id: Ic411505a0370be2b56150275fa9b8f5329241ce8
Elliott Hughes [Tue, 18 Nov 2014 21:55:12 +0000 (21:55 +0000)]
Merge "Kill unused ARCH_* defines."
Elliott Hughes [Tue, 18 Nov 2014 20:57:34 +0000 (12:57 -0800)]
Kill unused ARCH_* defines.
No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more
aspirational than real.
Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6
Elliott Hughes [Tue, 18 Nov 2014 20:52:31 +0000 (20:52 +0000)]
Merge "Remove libdvm dex preopt support."
Ying Wang [Tue, 18 Nov 2014 20:41:53 +0000 (12:41 -0800)]
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.
Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
Yabin Cui [Tue, 18 Nov 2014 03:40:34 +0000 (03:40 +0000)]
Merge "kill HAVE_TERMIO_H"
Elliott Hughes [Mon, 17 Nov 2014 18:22:49 +0000 (10:22 -0800)]
Remove libdvm dex preopt support.
libdvm is dead.
Change-Id: Ib8571c007f8a9f0e0eaf5c61b5d2e416b2d95089
Dan Albert [Mon, 17 Nov 2014 23:55:57 +0000 (23:55 +0000)]
Merge "Fix the libgcc/libatomic link order."
Dan Albert [Mon, 17 Nov 2014 23:05:48 +0000 (23:05 +0000)]
Merge "Remove libstlport from PRODUCT_PACKAGES."
Yabin Cui [Mon, 17 Nov 2014 22:49:39 +0000 (14:49 -0800)]
kill HAVE_TERMIO_H
Bug:
18398307
Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
Dan Albert [Mon, 17 Nov 2014 22:26:11 +0000 (14:26 -0800)]
Remove libstlport from PRODUCT_PACKAGES.
Bug:
15193147
Change-Id: Idd2699d895393216bcd514da64145540faec4033
Miao Wang [Mon, 17 Nov 2014 21:25:24 +0000 (21:25 +0000)]
Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib."
Dan Albert [Mon, 17 Nov 2014 20:29:42 +0000 (20:29 +0000)]
Merge "Disable gnu style linker hash for NDK builds."
Ying Wang [Mon, 17 Nov 2014 19:34:32 +0000 (19:34 +0000)]
Merge "Fix PDK build."
Ying Wang [Mon, 17 Nov 2014 19:34:21 +0000 (19:34 +0000)]
Merge "Install preloaded-classes as a standalone configuration file"
Dan Albert [Mon, 17 Nov 2014 19:34:11 +0000 (19:34 +0000)]
Merge "Colorize build success/failure message."
Ying Wang [Mon, 17 Nov 2014 19:01:18 +0000 (11:01 -0800)]
Fix PDK build.
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug:
18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
Ying Wang [Thu, 13 Nov 2014 23:19:12 +0000 (15:19 -0800)]
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
Dan Albert [Sat, 15 Nov 2014 23:42:15 +0000 (23:42 +0000)]
Merge "Remove logic for platform stlport gtest."
Miao Wang [Sat, 15 Nov 2014 22:25:33 +0000 (14:25 -0800)]
Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
Bug
18395015
Change-Id: Ib9aecf347c685c8b8b725eecfbc0cec03d9b2c1b
Dan Albert [Sun, 9 Nov 2014 06:41:52 +0000 (22:41 -0800)]
Colorize build success/failure message.
Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
Dan Albert [Fri, 14 Nov 2014 23:28:49 +0000 (15:28 -0800)]
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
Ying Wang [Fri, 14 Nov 2014 18:53:57 +0000 (18:53 +0000)]
Merge "sign_target_files_apks: fix recovery patch generation"
Dan Albert [Fri, 14 Nov 2014 18:01:21 +0000 (18:01 +0000)]
Merge "Refactor transform-o-to-* definitions."
Dmitriy Ivanov [Fri, 14 Nov 2014 17:50:39 +0000 (17:50 +0000)]
Merge "Fix device detection and path to tapas"
Dan Albert [Fri, 14 Nov 2014 05:24:04 +0000 (21:24 -0800)]
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
Dmitriy Ivanov [Wed, 12 Nov 2014 22:16:12 +0000 (14:16 -0800)]
Fix device detection and path to tapas
1. Some devices do not set ro.product.device in which
case take it from ro.hardware
2. Add path to tapas symbols to sysroot and solib-search-path
for tapas users only
Change-Id: I4eed2d3c3aefd95070beebdbfba4464a524c3066
Stephen Hines [Fri, 14 Nov 2014 03:07:31 +0000 (03:07 +0000)]
Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
Stephen Hines [Fri, 14 Nov 2014 03:03:59 +0000 (19:03 -0800)]
Clean out *.prop files due to dex2oat instruction-set flag change.
Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
Dmitriy Ivanov [Fri, 14 Nov 2014 01:46:59 +0000 (01:46 +0000)]
Merge "Switch --hash-style to gnu"
Ian Rogers [Fri, 14 Nov 2014 00:21:52 +0000 (00:21 +0000)]
Merge "Pass instruction set variant to dex2oat."
Dan Albert [Thu, 13 Nov 2014 18:15:46 +0000 (10:15 -0800)]
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
Yabin Cui [Thu, 13 Nov 2014 23:22:46 +0000 (23:22 +0000)]
Merge "kill HAVE_FORKEXEC"
Dmitriy Ivanov [Thu, 13 Nov 2014 22:51:10 +0000 (14:51 -0800)]
Switch --hash-style to gnu
Bug:
18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
Yabin Cui [Thu, 13 Nov 2014 20:00:23 +0000 (20:00 +0000)]
Merge "kill HAVE_LOCALTIME_R"
Yabin Cui [Thu, 13 Nov 2014 19:51:37 +0000 (11:51 -0800)]
kill HAVE_LOCALTIME_R
Bug:
18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
Yabin Cui [Thu, 13 Nov 2014 19:10:25 +0000 (19:10 +0000)]
Merge "kill HAVE_GETHOSTBYNAME_R"
Yabin Cui [Thu, 13 Nov 2014 18:25:56 +0000 (10:25 -0800)]
kill HAVE_GETHOSTBYNAME_R
Bug:
18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
Elliott Hughes [Thu, 13 Nov 2014 05:20:37 +0000 (05:20 +0000)]
Merge "Remove HAVE_SHORT_ENUMS."
Elliott Hughes [Thu, 13 Nov 2014 05:07:07 +0000 (21:07 -0800)]
Remove HAVE_SHORT_ENUMS.
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
Yabin Cui [Thu, 13 Nov 2014 01:15:30 +0000 (17:15 -0800)]
kill HAVE_FORKEXEC
Bug:
18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
Yabin Cui [Thu, 13 Nov 2014 00:02:24 +0000 (00:02 +0000)]
Merge "kill HAVE_POSIX_FILEMAP"
Chih-Hung Hsieh [Wed, 12 Nov 2014 23:13:36 +0000 (23:13 +0000)]
Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"
Andrew Boie [Mon, 15 Sep 2014 23:01:07 +0000 (16:01 -0700)]
sign_target_files_apks: fix recovery patch generation
When rebuilding recovery, the boot images created for patching
purposes still were being signed with the old verity key and
not the new one specified on the command line.
In addition, the replacement verity public key in the boot ramdisk
wasn't being used.
Change-Id: I451e17d1cf08c507580c4b58134c1069532740e8
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Dan Albert [Wed, 12 Nov 2014 00:19:59 +0000 (16:19 -0800)]
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
Dan Albert [Tue, 11 Nov 2014 22:47:47 +0000 (22:47 +0000)]
Merge "Make modules depend on their makefile."
Dan Albert [Sun, 9 Nov 2014 06:20:03 +0000 (22:20 -0800)]
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
Dan Albert [Tue, 11 Nov 2014 19:28:34 +0000 (19:28 +0000)]
Merge "Use platform protobuf unless building with NDK."
Dan Albert [Tue, 11 Nov 2014 18:42:17 +0000 (10:42 -0800)]
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
Yabin Cui [Tue, 11 Nov 2014 18:34:37 +0000 (10:34 -0800)]
kill HAVE_POSIX_FILEMAP
Bug:
18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
Elliott Hughes [Tue, 11 Nov 2014 17:59:17 +0000 (17:59 +0000)]
Merge "Remove unused variables from select.mk."