Dirk Dougherty
7de9c94263
am 45094b5d: am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit '45094b5d05e1e88d4cd389331c2faa1a52d1d68d':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 03:06:37 +00:00
Dirk Dougherty
45094b5d05
am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit 'd0c6f0a11c0a29b3bb0ebabf6522cdf4f401456a':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 03:04:01 +00:00
Dirk Dougherty
d0c6f0a11c
am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit '318fb97168396d21a958a415e9a1cf8167ebdc86':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 03:02:02 +00:00
Dirk Dougherty
318fb97168
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
Change-Id: Ib140e7025360d60e6fb49e1e6c45e2c7ccc72cda
2014-04-13 19:57:44 -07:00
Colin Cross
25313cd32a
am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
...
* commit '59cc3f5d2a65d1114b0643c453af8b9249970dfd':
build: remove LOCAL_NO_2ND_ARCH
2014-04-12 00:09:41 +00:00
Colin Cross
59cc3f5d2a
am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
...
* commit '5b1fa1c8a05618a2c47edc628b2bafe4a9c6c50a':
build: remove LOCAL_NO_2ND_ARCH
2014-04-12 00:08:19 +00:00
Colin Cross
5b1fa1c8a0
Merge "build: remove LOCAL_NO_2ND_ARCH"
2014-04-12 00:06:30 +00:00
Colin Cross
149d65b177
build: remove LOCAL_NO_2ND_ARCH
...
Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent
functionality is available with LOCAL_MULTILIB := first.
Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
2014-04-11 16:57:36 -07:00
Ben Cheng
e921da9def
am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )""
...
* commit 'bddce34c160846ab67907fcbec0f6a6f838c20d4':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
2014-04-11 23:44:52 +00:00
Ben Cheng
bddce34c16
am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )""
...
* commit '065c41809f8db0151a1f5c2751f1f58846d58988':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
2014-04-11 23:41:28 +00:00
Ben Cheng
065c41809f
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )""
2014-04-11 23:37:44 +00:00
Ben Cheng
38fef38c40
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
...
This reverts commit 1ae9b213eb
.
Sigh... new warnings found by 4.9 break checkbuild.
Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
2014-04-11 23:36:25 +00:00
Ben Cheng
c9f9decdca
am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
...
* commit '4eea070ca2cf44adbb39e6d1108a2cc547ff6efa':
Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )
2014-04-11 22:40:46 +00:00
Ben Cheng
4eea070ca2
am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
...
* commit 'f702d6d1d534c914bc0127937eb1a1df61c60762':
Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )
2014-04-11 22:38:37 +00:00
Ben Cheng
f702d6d1d5
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )"
2014-04-11 22:36:45 +00:00
Ben Cheng
1ae9b213eb
Use aarch64-linux-android-4.9 for arm64 build (attempt #2 )
...
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.
Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
2014-04-11 12:22:56 -07:00
Ben Cheng
e4d787bfbb
am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
...
* commit '7e793040be265c2d221cd83e34a53bc7d011206f':
Decouple platform compiler and NDK library versioning.
2014-04-11 17:08:22 +00:00
Ben Cheng
7e793040be
am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
...
* commit 'eec11d9727ab0e6bc843f059d5f2921ada2e8e9a':
Decouple platform compiler and NDK library versioning.
2014-04-11 17:05:32 +00:00
Ben Cheng
eec11d9727
Merge "Decouple platform compiler and NDK library versioning."
2014-04-11 17:02:32 +00:00
Colin Cross
1420377261
am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
...
* commit '3221717fec6c150a24505ed392279a73da5c4e26':
build: remove packages/ from 64-bit blacklist
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
build: add support for LOCAL_MULTILIB := 64
build: fix TARGET_PREFER_32_BIT
2014-04-11 09:57:20 +00:00
Scott Main
7bb8315cf6
am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit '4786cc3b132037f187c798593575e0053074b653':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 08:57:50 +00:00
Scott Main
4786cc3b13
am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit 'de22e6fb9bd31e6c41ebdb43b28d0b8fd719a80f':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 08:54:39 +00:00
Scott Main
de22e6fb9b
am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit '20cf2a91f0c157875574dd0b0d9b4e040f94e656':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 08:17:21 +00:00
Colin Cross
3221717fec
am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
...
* commit 'a355ae12506150a7a676956f3c5083f852ba5722':
build: remove packages/ from 64-bit blacklist
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
build: add support for LOCAL_MULTILIB := 64
build: fix TARGET_PREFER_32_BIT
2014-04-11 07:17:10 +00:00
Colin Cross
a355ae1250
Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
...
* changes:
build: remove packages/ from 64-bit blacklist
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
build: add support for LOCAL_MULTILIB := 64
build: fix TARGET_PREFER_32_BIT
2014-04-11 05:50:10 +00:00
Ben Cheng
4de6fa4069
Decouple platform compiler and NDK library versioning.
...
TARGET_GCC_VERSION: select compiler from prebuilts/gcc/...
TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/...
Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
2014-04-10 22:46:26 -07:00
Colin Cross
161cd77f21
build: remove packages/ from 64-bit blacklist
...
Everything under packages/ will build for 64-bit now, and
package.mk has been updated to not produce 64-bit libraries
on devices that don't support them (all of them right now).
Change-Id: I2c10e41f727cfc8fe237819308a6dfa34c4fff3f
2014-04-10 20:44:24 -07:00
Colin Cross
1750944332
build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
...
Use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS to
determine which native libraries to build for an app. If
both are set, it will use 64-bit unless TARGET_PREFER_32_BIT is set.
If only one is set, it will only build apps that work on that
architecture. If neither is set it will fall back to only building
32-bit apps.
On existing 32-bit devices neither variable will be set, and the
build system will continue to build 32-bit apps.
Once a device has support for a 64-bit runtime, the same logic
that selects the dual runtimes should set TARGET_SUPPORTS_32_BIT_APPS
and TARGET_SUPPORTS_64_BIT_APPS, and packages will be built for
the preferred arch, or fall back to the non-preferrred arch if
necessary.
For testing, a device may set TARGET_SUPPORTS_64_BIT_APPS without
TARGET_SUPPORTS_32_BIT_APPS to produce only 64-bit apps.
Change-Id: I5b5e23f15602c3cf9bd96791971208a85492c7a3
2014-04-10 20:44:24 -07:00
Scott Main
20cf2a91f0
update sticky nav to sync with sidenav
...
and build the breadcrumbs dynamically
Change-Id: Ib008d4606a8e82c468be75c051a8a9e623dc7c22
2014-04-10 20:13:54 -07:00
Colin Cross
dc1c95aa20
build: add support for LOCAL_MULTILIB := 64
...
I don't expect it to be useful for modules, but package.mk will
use it to only install 64-bit native apps on devices that
only have a 64-bit zygote.
Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
2014-04-10 15:49:38 -07:00
Colin Cross
d3624d5f48
build: fix TARGET_PREFER_32_BIT
...
TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed,
it needs to try the 32-bit rule first, then fall back to the 64-bit
rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build.
Also port TARGET_PREFER_32_BIT to package.mk.
Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
2014-04-10 15:49:32 -07:00
Colin Cross
fa75d63cd7
am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
...
* commit 'dbf1f8047be813537ddaebd777adc242a34f8204':
gdbclient: use 64-bit suffix for all library symbols
2014-04-10 20:20:09 +00:00
Colin Cross
dbf1f8047b
am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
...
* commit '80f7dbd4deb0a765eaf4a697ea3bcc2e5f2c5b3b':
gdbclient: use 64-bit suffix for all library symbols
2014-04-10 20:17:09 +00:00
Colin Cross
80f7dbd4de
Merge "gdbclient: use 64-bit suffix for all library symbols"
2014-04-10 20:15:22 +00:00
Colin Cross
84480ad0ee
gdbclient: use 64-bit suffix for all library symbols
...
Correct the solib-search-path for 64-bit to look in /system/lib64
for all libraries including those in subdirectories.
Change-Id: I606a0eae1137a857564facc79306ad83097d9659
2014-04-10 12:51:39 -07:00
Ben Cheng
c77ffa8923
am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
...
* commit 'add6c03742a61209030491f4afb1b7a37b9ddb7d':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
2014-04-10 17:21:49 +00:00
Ben Cheng
add6c03742
am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
...
* commit '13eaf184f6e5c803f52f5003ace36bafe64671c9':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
2014-04-10 17:18:26 +00:00
Ben Cheng
13eaf184f6
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
2014-04-10 17:14:57 +00:00
Ben Cheng
81892e29ff
Revert "Use aarch64-linux-android-4.9 for arm64 build."
...
This reverts commit 6154690d86
.
Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
2014-04-10 17:14:01 +00:00
Ben Cheng
9cbf732fa3
am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
...
* commit '98bb9d6cbe081ecf1ddbfad8d00f498a506e1bf2':
Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:39:02 +00:00
Ben Cheng
98bb9d6cbe
am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
...
* commit 'd957d6bbdb29fccae74f3511251cae22376550af':
Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:36:06 +00:00
Ben Cheng
d957d6bbdb
Merge "Use aarch64-linux-android-4.9 for arm64 build."
2014-04-10 16:33:51 +00:00
Ben Cheng
6154690d86
Use aarch64-linux-android-4.9 for arm64 build.
...
Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
2014-04-09 15:58:08 -07:00
Ying Wang
09ba20ce64
am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."
...
* commit 'fd251b33abd2de9c288d56993978dc36976198a7':
Increase the maximum javac heap size again.
2014-04-09 21:34:12 +00:00
Ying Wang
fd251b33ab
am 1a4676a1: Merge "Increase the maximum javac heap size again."
...
* commit '1a4676a17c5483c04f347a4e58890640a71c8368':
Increase the maximum javac heap size again.
2014-04-09 21:32:16 +00:00
Ying Wang
1a4676a17c
Merge "Increase the maximum javac heap size again."
2014-04-09 21:29:19 +00:00
Ying Wang
d81d71a020
Increase the maximum javac heap size again.
...
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
2014-04-09 14:27:29 -07:00
Narayan Kamath
6c0fba0f98
am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
...
* commit 'ae44bb55bd39ba66ad3882c7e63bf188600ffe14':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:14:38 +00:00
Narayan Kamath
ae44bb55bd
am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
...
* commit '94147a919b1148d8a128a99b33f3c938d87452c7':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:11:01 +00:00
Narayan Kamath
94147a919b
Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
2014-04-09 16:08:31 +00:00