OSDN Git Service
Stephen Hines [Fri, 26 Sep 2014 19:45:22 +0000 (19:45 +0000)]
am
3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
* commit '
3cf2057079df33e914640c3fe2b1ef7a10495064':
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
Stephen Hines [Fri, 26 Sep 2014 17:53:22 +0000 (17:53 +0000)]
Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
Ian Rogers [Fri, 26 Sep 2014 15:48:25 +0000 (15:48 +0000)]
am
577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit '
577184aa86eefc4b7b177eeafcd8209028d86b2d':
Test __GLIBC__ is defined before using its value.
Ian Rogers [Fri, 26 Sep 2014 15:45:40 +0000 (15:45 +0000)]
Merge "Test __GLIBC__ is defined before using its value."
Ian Rogers [Fri, 26 Sep 2014 00:34:40 +0000 (17:34 -0700)]
Test __GLIBC__ is defined before using its value.
Avoids -Wundef warning.
Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
Lai Wei-Chih [Wed, 17 Sep 2014 05:55:08 +0000 (13:55 +0800)]
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
This removes the hard-coded '3.5' in the various paths and makes switching to
a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6).
Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081
Dan Albert [Wed, 24 Sep 2014 16:13:18 +0000 (16:13 +0000)]
am
33029248: Merge "Add option for generating coverage info."
* commit '
330292480272aed3d7663ae7a7668675c742b2e0':
Add option for generating coverage info.
Dan Albert [Wed, 24 Sep 2014 16:03:27 +0000 (16:03 +0000)]
Merge "Add option for generating coverage info."
Dan Albert [Fri, 19 Sep 2014 21:25:57 +0000 (14:25 -0700)]
Add option for generating coverage info.
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.
Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.
This is currently not supported for clang (b/
17574078, b/
17583330).
If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.
Bug:
10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
Elliott Hughes [Tue, 23 Sep 2014 21:30:09 +0000 (21:30 +0000)]
am
cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '
cb0755f8c92c252331614bee7bceeb897357e0f1':
Remove unused HAVE_OFF64_T.
Elliott Hughes [Tue, 23 Sep 2014 21:23:21 +0000 (21:23 +0000)]
Merge "Remove unused HAVE_OFF64_T."
Elliott Hughes [Tue, 23 Sep 2014 20:36:01 +0000 (13:36 -0700)]
Remove unused HAVE_OFF64_T.
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
Elliott Hughes [Tue, 23 Sep 2014 16:11:03 +0000 (16:11 +0000)]
am
88c7544e: Merge "Remove the unused IPC macros."
* commit '
88c7544e711e70273b3ab29251ba2ff359a7ea1a':
Remove the unused IPC macros.
Elliott Hughes [Tue, 23 Sep 2014 16:01:13 +0000 (16:01 +0000)]
Merge "Remove the unused IPC macros."
Elliott Hughes [Tue, 23 Sep 2014 03:43:32 +0000 (20:43 -0700)]
Remove the unused IPC macros.
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.
Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
Elliott Hughes [Tue, 23 Sep 2014 01:54:23 +0000 (01:54 +0000)]
am
c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '
c65d93f6964a313f64fee031d8dcdbe996a7204d':
build: remove HAVE_OOM_ADJ
Elliott Hughes [Tue, 23 Sep 2014 01:49:09 +0000 (01:49 +0000)]
Merge "build: remove HAVE_OOM_ADJ"
Todd Poynor [Thu, 5 Sep 2013 00:46:42 +0000 (17:46 -0700)]
build: remove HAVE_OOM_ADJ
This define is no longer used.
Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
Ying Wang [Mon, 22 Sep 2014 16:50:14 +0000 (16:50 +0000)]
am
c5a99042: Merge "Use "" to preserve argument word breaks"
* commit '
c5a99042e944787b2cd5f2e93ba4775ffd9e36fc':
Use "$@" to preserve argument word breaks
Ying Wang [Mon, 22 Sep 2014 16:42:34 +0000 (16:42 +0000)]
Merge "Use "$@" to preserve argument word breaks"
Ying Wang [Tue, 1 Jul 2014 17:58:10 +0000 (10:58 -0700)]
Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.
(cherry picked from commit
dcc8b3729dd1cb89ed344a3855bac9584ac183ac)
Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
Ying Wang [Sat, 20 Sep 2014 00:49:36 +0000 (00:49 +0000)]
am
b69b7d7f: Merge "Fix recovery image build for 32p"
* commit '
b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
Fix recovery image build for 32p
Ying Wang [Sat, 20 Sep 2014 00:38:07 +0000 (00:38 +0000)]
Merge "Fix recovery image build for 32p"
Bill Yi [Fri, 19 Sep 2014 23:46:29 +0000 (23:46 +0000)]
am
70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
* commit '
70d3c707caa45968508d45c703b0edb13199b5ea':
Remove PinyinIME from target config - DO NOT MERGE
Bill Yi [Fri, 19 Sep 2014 23:36:03 +0000 (23:36 +0000)]
Merge "Remove PinyinIME from target config - DO NOT MERGE"
Bill Yi [Fri, 19 Sep 2014 23:06:19 +0000 (16:06 -0700)]
Remove PinyinIME from target config - DO NOT MERGE
BUG:
17578207
Elliott Hughes [Fri, 19 Sep 2014 23:02:38 +0000 (23:02 +0000)]
am
e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '
e2f547060678ed4199b9f398b95643e08e6b6959':
Remove unused HAVE_EPOLL.
Elliott Hughes [Fri, 19 Sep 2014 22:54:17 +0000 (22:54 +0000)]
Merge "Remove unused HAVE_EPOLL."
Elliott Hughes [Fri, 19 Sep 2014 22:12:56 +0000 (15:12 -0700)]
Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.
Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
Brian Carlstrom [Fri, 19 Sep 2014 21:49:13 +0000 (21:49 +0000)]
am
b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '
b97b1e59409ea4b873dbb8d83ba73f978ba7fcba':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Brian Carlstrom [Fri, 19 Sep 2014 21:41:01 +0000 (21:41 +0000)]
Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
Brian Carlstrom [Fri, 19 Sep 2014 18:30:27 +0000 (11:30 -0700)]
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Bug:
17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
Dan Albert [Fri, 19 Sep 2014 00:06:28 +0000 (00:06 +0000)]
am
98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '
98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
Move selection of C++ STL into the build system.
Dan Albert [Thu, 18 Sep 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Move selection of C++ STL into the build system."
Dan Albert [Fri, 12 Sep 2014 21:46:57 +0000 (14:46 -0700)]
Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).
The selection of the STL is as follows:
if LOCAL_CXX_STL == 'default'
ifdef LOCAL_SDK_VERSION
Use whatever STL the other NDK options have selected.
else
Use bionic's libstdc++ for target, GNU libstdc++ for host. This
is compatible with the existing build options.
endif
else
if LOCAL_CXX_STL == 'stlport'
Use stlport.
else if LOCAL_CXX_STL == 'libc++'
Use libc++.
else if LOCAL_CXX_STL == ''
Don't use any STL.
endif
endif
Bug:
15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
Clay Murphy [Thu, 18 Sep 2014 18:33:13 +0000 (18:33 +0000)]
am
ef3148c1: Merge "Docs: Replacing s.a.c. Android logo to match other sites."
* commit '
ef3148c1fa2173a6ed5c4f7a02955acddf88d6ac':
Docs: Replacing s.a.c. Android logo to match other sites.
Clay Murphy [Thu, 18 Sep 2014 18:26:58 +0000 (18:26 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
Ying Wang [Tue, 16 Sep 2014 08:22:27 +0000 (08:22 +0000)]
am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
88cfa0324724c7e90bfed3aaa61c27ca0926860b':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:22:26 +0000 (08:22 +0000)]
am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
8209d993da63dcf3ac6b3e9d236e2baf0fcd51a0':
Support to build apk odex for both arch.
Bruce Beare [Fri, 12 Sep 2014 16:10:37 +0000 (09:10 -0700)]
Fix recovery image build for 32p
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..
Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Mon, 15 Sep 2014 19:14:20 +0000 (19:14 +0000)]
Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
Ying Wang [Mon, 15 Sep 2014 19:14:15 +0000 (19:14 +0000)]
Merge "Support to build apk odex for both arch."
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
Support to build apk odex for both arch.
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug:
17409149
Bug:
14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
Brian Carlstrom [Fri, 12 Sep 2014 22:29:00 +0000 (22:29 +0000)]
am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7':
Fix mma/mmma by making gettop canonicalize TOP when set
Brian Carlstrom [Fri, 12 Sep 2014 22:18:11 +0000 (22:18 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
(cherry picked from commit
a5c4f178ae3f3e94b1d1dceae3cc8d3196633c4a)
Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
Dan Albert [Thu, 11 Sep 2014 01:42:49 +0000 (01:42 +0000)]
am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
1feb478d28cfb427650e4cd2752bcd988b3258e6':
Missed one part of removing the vbox target.
Dan Albert [Thu, 11 Sep 2014 01:32:05 +0000 (01:32 +0000)]
Merge "Missed one part of removing the vbox target."
Dan Albert [Wed, 10 Sep 2014 22:58:20 +0000 (15:58 -0700)]
Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
Dan Albert [Wed, 10 Sep 2014 22:39:26 +0000 (22:39 +0000)]
am
30dbfce5: Merge "Remove the vbox target from the build system."
* commit '
30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
Dan Albert [Wed, 10 Sep 2014 22:31:41 +0000 (22:31 +0000)]
Merge "Remove the vbox target from the build system."
Dan Albert [Wed, 10 Sep 2014 22:10:31 +0000 (15:10 -0700)]
Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
Ying Wang [Wed, 10 Sep 2014 17:05:59 +0000 (17:05 +0000)]
am
48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit '
48505328c83d644db04703ce35af81d368279fc4':
Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Ying Wang [Wed, 10 Sep 2014 16:26:49 +0000 (16:26 +0000)]
Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
Alexander Ivchenko [Tue, 9 Sep 2014 13:24:27 +0000 (17:24 +0400)]
Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
Remove -fPIC (compiler provides by default).
Remove -fno-inline-functions-called-once.
Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
Ying Wang [Fri, 5 Sep 2014 23:49:14 +0000 (23:49 +0000)]
am
53e95027: Merge "Add LOCAL_POST_LINK_CMD."
* commit '
53e9502704bb492e0c387a21098f772f2aa60da9':
Add LOCAL_POST_LINK_CMD.
Ying Wang [Fri, 5 Sep 2014 23:41:13 +0000 (23:41 +0000)]
Merge "Add LOCAL_POST_LINK_CMD."
Ying Wang [Fri, 5 Sep 2014 22:46:43 +0000 (15:46 -0700)]
Add LOCAL_POST_LINK_CMD.
For now we support LOCAL_POST_LINK_CMD only for static executables.
This fixed the hack of building linker which need to insert additional
step after link.
Bug:
17403674
Change-Id: Iefdfe1e3fab3a30c5d4ad701d46f931481eab572
Chih-Hung Hsieh [Fri, 5 Sep 2014 02:19:57 +0000 (02:19 +0000)]
am
1051d5dc: Merge "Add LOCAL_CLANG_*FLAGS for clang only flags."
* commit '
1051d5dc21549b852f5452aa3a265e2f8c6c61b9':
Add LOCAL_CLANG_*FLAGS for clang only flags.
Chih-Hung Hsieh [Fri, 5 Sep 2014 02:13:10 +0000 (02:13 +0000)]
Merge "Add LOCAL_CLANG_*FLAGS for clang only flags."
Chih-Hung Hsieh [Fri, 5 Sep 2014 00:15:47 +0000 (17:15 -0700)]
Add LOCAL_CLANG_*FLAGS for clang only flags.
To be used only for some modules.
Change-Id: I107ec37f11f738f860598f0c86c4ad7ec20c9011
Elliott Hughes [Thu, 4 Sep 2014 00:04:59 +0000 (00:04 +0000)]
am
5c11a76b: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
* commit '
5c11a76badbea36c4f6b89a0d2b2dd2acee35a5d':
Add debug.atrace.tags.enableflags=0 to /default.prop.
Elliott Hughes [Wed, 3 Sep 2014 23:55:03 +0000 (23:55 +0000)]
Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
Tim Murray [Wed, 3 Sep 2014 22:55:51 +0000 (22:55 +0000)]
am
039cd7e0: Merge "Add LOCAL_NO_FPIE."
* commit '
039cd7e076e904dfe6d4c9e2e2d99fb31444b2ad':
Add LOCAL_NO_FPIE.
Tim Murray [Wed, 3 Sep 2014 22:46:45 +0000 (22:46 +0000)]
Merge "Add LOCAL_NO_FPIE."
Tim Murray [Wed, 3 Sep 2014 22:01:46 +0000 (15:01 -0700)]
Add LOCAL_NO_FPIE.
Not all executables should be built with -pie.
bug
15814177
Change-Id: I402e8a531866b507ee80a0bf677f9f3551ca7693
Ying Wang [Wed, 3 Sep 2014 19:30:25 +0000 (19:30 +0000)]
am
7754e0ce: Merge "[MIPS64] Modify the default MIPS64 build to MIPS64R6."
* commit '
7754e0ce894044e43c50e002e342f03317205668':
[MIPS64] Modify the default MIPS64 build to MIPS64R6.
Ying Wang [Wed, 3 Sep 2014 19:20:28 +0000 (19:20 +0000)]
Merge "[MIPS64] Modify the default MIPS64 build to MIPS64R6."
Stephen Smalley [Wed, 3 Sep 2014 19:08:08 +0000 (15:08 -0400)]
Add debug.atrace.tags.enableflags=0 to /default.prop.
This ensures that the property is always set by init
prior to starting any other process, which avoids the need
for the bionic systrace code to try to set the property
if it has not already been set to avoid the full cost of
searching for an undefined property each time. See
change I30ed5b377c91ca4c36568a0e647ddf95d4e4a61a for
the relevant bionic code.
The problem with the current bionic code is that it can
trigger an attempt to set this property from any random
process, which will be denied unless the process is already
authorized to set debug properties. This is visible in the
form of various SELinux avc: denied messages and
init sys_prop: permission denied messages in dmesg output.
Allowing all domains to set such properties is undesirable.
Change-Id: I6d953c0c281fd72ad3eba8a479fd258023579b5b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Stephen Hines [Wed, 3 Sep 2014 16:09:03 +0000 (16:09 +0000)]
am
2f9fa520: Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE."
* commit '
2f9fa5202532fb2b5c9ea89a4c15171346f63ec1':
Fix build breakage due to incorrect bcc_compat RS_TRIPLE.
Stephen Hines [Wed, 3 Sep 2014 16:02:08 +0000 (16:02 +0000)]
Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE."
Stephen Hines [Wed, 3 Sep 2014 02:09:35 +0000 (19:09 -0700)]
Fix build breakage due to incorrect bcc_compat RS_TRIPLE.
Bug:
17333374
Change-Id: I13582ce0cde86f7b3728aa4f45a5197438d65a2d
(cherry picked from commit
52626d2a7b4767905e8a369ddc8316c1290ad156)
Ying Wang [Wed, 3 Sep 2014 01:09:58 +0000 (01:09 +0000)]
am
cee38d55: Merge "[MIPSR6] R6 target options for clang"
* commit '
cee38d55f8021c9720b883fc1e4feafc8f45d87c':
[MIPSR6] R6 target options for clang
Ying Wang [Wed, 3 Sep 2014 01:02:54 +0000 (01:02 +0000)]
Merge "[MIPSR6] R6 target options for clang"
Raghu Gandham [Tue, 2 Sep 2014 23:30:00 +0000 (16:30 -0700)]
[MIPS64] Modify the default MIPS64 build to MIPS64R6.
Change-Id: I797e4c2e5b69c6991545c26886b5b25e6f8c2a67
Ying Wang [Tue, 2 Sep 2014 23:16:25 +0000 (23:16 +0000)]
am
0850330c: Merge "Default host module to 64-bit except for SDK builds."
* commit '
0850330caa352ea2dc412df495c6ad95e4264d05':
Default host module to 64-bit except for SDK builds.
Ying Wang [Tue, 2 Sep 2014 23:05:43 +0000 (23:05 +0000)]
Merge "Default host module to 64-bit except for SDK builds."
Ying Wang [Tue, 2 Sep 2014 22:11:20 +0000 (15:11 -0700)]
Default host module to 64-bit except for SDK builds.
Set "HOST_PREFER_32_BIT := true" only if "sdk" or "win_sdk" is among the
make command line goals, or it's a MinGW windows build, which only builds
host SDK tools.
Bug:
13751317
Change-Id: I8ec1a97a5d1af065a153b16523c2ee3434d0dd71
Stephen Hines [Tue, 2 Sep 2014 16:31:35 +0000 (16:31 +0000)]
am
ec8778e8: Merge "Fix RS_TRIPLE and RS_TRIPLE_CFLAGS."
* commit '
ec8778e89f872b9a12cc6b3367400ecd33cb32d0':
Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.
Stephen Hines [Tue, 2 Sep 2014 16:23:10 +0000 (16:23 +0000)]
Merge "Fix RS_TRIPLE and RS_TRIPLE_CFLAGS."
Ying Wang [Mon, 1 Sep 2014 17:58:52 +0000 (17:58 +0000)]
am
7852b80c: Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don\'t support 64-bit on old Atom."
* commit '
7852b80c05e33c873819b1bf22bcaa54bb583c99':
Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom.
Ying Wang [Mon, 1 Sep 2014 17:47:54 +0000 (17:47 +0000)]
Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom."
Marcin Kosiba [Mon, 1 Sep 2014 10:30:13 +0000 (10:30 +0000)]
am
15493ceb: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS for real."
* commit '
15493ceba52ce6bc962c66fd38d1cb0cbd88e2eb':
Remove webviewchromium from PRODUCT_BOOT_JARS for real.
Marcin Kosiba [Mon, 1 Sep 2014 10:20:14 +0000 (10:20 +0000)]
Merge "Remove webviewchromium from PRODUCT_BOOT_JARS for real."
Marcin Kosiba [Mon, 1 Sep 2014 09:57:44 +0000 (10:57 +0100)]
Remove webviewchromium from PRODUCT_BOOT_JARS for real.
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.
The previous change removed the webview from core_minimal.mk but
not from core_base.mk, which is what this change addresses.
Change-Id: I6f4bcd427a7e65f3a20372c3c177e9342a953290
Marcin Kosiba [Mon, 1 Sep 2014 09:37:10 +0000 (09:37 +0000)]
am
aab8cdb7: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS."
* commit '
aab8cdb7044555fc88c7aaffa83884bb68a2ddb0':
Remove webviewchromium from PRODUCT_BOOT_JARS.
Marcin Kosiba [Mon, 1 Sep 2014 09:26:59 +0000 (09:26 +0000)]
Merge "Remove webviewchromium from PRODUCT_BOOT_JARS."
Marcin Kosiba [Mon, 1 Sep 2014 09:21:28 +0000 (10:21 +0100)]
Remove webviewchromium from PRODUCT_BOOT_JARS.
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.
Bug:
16329371
Change-Id: Ibed49641d04fd5e93e26ab12e203e4596e0b3bb6
Stephen Hines [Fri, 29 Aug 2014 21:43:53 +0000 (14:43 -0700)]
Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.
Bug:
17333374
Add RS_TRIPLE_CFLAGS to ensure that we build with the proper defines on
targets like x86. This also changes all build targets to use the
proper 32/64-bit triples when creating their runtime libraries.
Change-Id: I8f6175b1a14af6d03ee90f32069f3688ec227fb9
Brian Carlstrom [Fri, 29 Aug 2014 05:27:45 +0000 (05:27 +0000)]
am
d2cf1b92: Merge "Add --no-include-debug-symbols to avoid bloat in user builds"
* commit '
d2cf1b924d3eee40c43d40af9dd66d9b83495b22':
Add --no-include-debug-symbols to avoid bloat in user builds
Brian Carlstrom [Fri, 29 Aug 2014 05:21:04 +0000 (05:21 +0000)]
Merge "Add --no-include-debug-symbols to avoid bloat in user builds"
Brian Carlstrom [Fri, 29 Aug 2014 00:16:11 +0000 (17:16 -0700)]
Add --no-include-debug-symbols to avoid bloat in user builds
Bug:
16938924
(cherry picked from commit
91b9d01b6ba2d3ea37928febce67d13c005a2336)
Change-Id: I0b744e0aaacc11fe8983f22f56ffc546a07ae764
Calin Juravle [Wed, 27 Aug 2014 15:58:44 +0000 (15:58 +0000)]
am
8078df97: Merge "Make sure that ro.dalvik.vm.native.bridge is always set."
* commit '
8078df9755fc0942feae8ac10a4965c5de4968a8':
Make sure that ro.dalvik.vm.native.bridge is always set.
Calin Juravle [Wed, 27 Aug 2014 15:50:28 +0000 (15:50 +0000)]
Merge "Make sure that ro.dalvik.vm.native.bridge is always set."
Calin Juravle [Tue, 26 Aug 2014 21:46:13 +0000 (22:46 +0100)]
Make sure that ro.dalvik.vm.native.bridge is always set.
A value of "0" means that native bridge is disabled.
Bug:
17104449
(cherry picked from commit
4f703a7f9ffd9a0d0432401a3173533d695d2ae6)
Change-Id: I4ca379923996ea08828dea4b2cd2da045e3f8031
Chih-Hung Hsieh [Wed, 27 Aug 2014 01:45:44 +0000 (01:45 +0000)]
am
90d5c7f6: Merge "Clang rejects -Wno-old-style-declaration flag."
* commit '
90d5c7f613c0fa7dc4c50a6d21d2484c1a1f0f66':
Clang rejects -Wno-old-style-declaration flag.
Chih-Hung Hsieh [Wed, 27 Aug 2014 01:27:39 +0000 (01:27 +0000)]
Merge "Clang rejects -Wno-old-style-declaration flag."
Chih-Hung Hsieh [Tue, 26 Aug 2014 23:37:00 +0000 (16:37 -0700)]
Clang rejects -Wno-old-style-declaration flag.
BUG:
17258227
Change-Id: I2a35263298ffd8dd7cda25183e185274cbf62b7b