OSDN Git Service
Evgeniy Stepanov [Wed, 16 Apr 2014 16:36:39 +0000 (16:36 +0000)]
am
5d8029f2: Update ASan configuration.
* commit '
5d8029f234669cf1688739437810db11dcdb403d':
Update ASan configuration.
Evgeniy Stepanov [Fri, 21 Feb 2014 14:10:53 +0000 (18:10 +0400)]
Update ASan configuration.
Change runtime library name to keep in sync with upstream.
Enable frame pointers in instrumented code for fast stack unwind.
Change-Id: I815912bb856c56c399639ea76ad4cb6b97961840
Ying Wang [Tue, 15 Apr 2014 23:48:27 +0000 (23:48 +0000)]
am
105ed03c: am
25e75aba: am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
105ed03cf01f2ece0aca279d4d53151b4fd4784e':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)]
am
25e75aba: am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
25e75abac2c9229c0c4741e33f504a341a36ad94':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Andrew Hsieh [Tue, 15 Apr 2014 23:42:34 +0000 (23:42 +0000)]
am
d37bf4e9: am
f93c7c70: am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
d37bf4e99509aeb98706a1a2d273f39b92c7cfdb':
Add -Wl,-maarch64linux
Andrew Hsieh [Tue, 15 Apr 2014 23:37:09 +0000 (23:37 +0000)]
am
f93c7c70: am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
f93c7c70247fb11dc99361c309bd6bd7b859e30e':
Add -Wl,-maarch64linux
Ying Wang [Tue, 15 Apr 2014 23:36:05 +0000 (23:36 +0000)]
am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:34:34 +0000 (23:34 +0000)]
am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:32:42 +0000 (23:32 +0000)]
Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
Ying Wang [Tue, 15 Apr 2014 22:36:06 +0000 (22:36 +0000)]
am
c73e4615: Fix variable name.
* commit '
c73e461537678af2c29fcc38857e26fa57103710':
Fix variable name.
Ying Wang [Tue, 15 Apr 2014 22:27:43 +0000 (15:27 -0700)]
Fix variable name.
Change-Id: Ie7439f71cf7fd2eeacd45a5d6625e610dad8bfbe
(cherry picked from commit
1a1dfcb5fcb6eda11d8dbf5df02f0083853dd5c1)
Andrew Hsieh [Tue, 15 Apr 2014 21:44:17 +0000 (21:44 +0000)]
am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
041d44705205f7b36108bcc3a9dafe321e301221':
Add -Wl,-maarch64linux
Ying Wang [Tue, 15 Apr 2014 21:42:27 +0000 (14:42 -0700)]
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Bug:
11368415
Bug:
14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
Andrew Hsieh [Tue, 15 Apr 2014 21:41:08 +0000 (21:41 +0000)]
am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
695d8f69561b8162abe8611d1f6796b6a91ca1ac':
Add -Wl,-maarch64linux
Andrew Hsieh [Tue, 15 Apr 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Add -Wl,-maarch64linux"
Ying Wang [Tue, 15 Apr 2014 21:02:38 +0000 (21:02 +0000)]
am
51f0d3f5: resolved conflicts for merge of
70555a16 to master
* commit '
51f0d3f58a5c04ee328778bc97e42dc10cfa41ad':
Allow to build target-files.zip in sdk build.
Narayan Kamath [Tue, 15 Apr 2014 21:02:06 +0000 (21:02 +0000)]
am
a1f8afa9: am
d954c6b9: am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
a1f8afa930ccaa0241892f25d37325743661755a':
"desktop" linux has Posix clocks.
Scott Main [Tue, 15 Apr 2014 21:02:05 +0000 (21:02 +0000)]
am
e65e2134: am
554bb7b6: am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
e65e2134444a28199c3ede61a692457c73478f94':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Ying Wang [Tue, 15 Apr 2014 20:55:24 +0000 (13:55 -0700)]
resolved conflicts for merge of
70555a16 to master
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
Narayan Kamath [Tue, 15 Apr 2014 20:52:52 +0000 (20:52 +0000)]
am
d954c6b9: am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
d954c6b92024fbb183ea3acb7366a39765a6e3c0':
"desktop" linux has Posix clocks.
Scott Main [Tue, 15 Apr 2014 20:52:27 +0000 (20:52 +0000)]
am
554bb7b6: am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
554bb7b61081e80d79bf29a3690ba6fff391df55':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Ying Wang [Tue, 15 Apr 2014 20:34:44 +0000 (20:34 +0000)]
am
114b46f1: Accomodate to the import syntax in build.prop.
* commit '
114b46f15dec20ad6b55879fe072220b07dcc099':
Accomodate to the import syntax in build.prop.
Ying Wang [Tue, 15 Apr 2014 20:34:43 +0000 (20:34 +0000)]
am
5a7ad033: Accomodate to the import syntax in build.prop.
* commit '
5a7ad0338bf027e6398bff411c826b24f4faf358':
Accomodate to the import syntax in build.prop.
Ying Wang [Tue, 15 Apr 2014 18:24:00 +0000 (11:24 -0700)]
Accomodate to the import syntax in build.prop.
Bug:
14024566
Change-Id: I71692244fabcd4d12f65849ffa027295b3a2a79a
(cherry picked from commit
092fea0d3e644573d7f0dbfe6692f42431f83c5c)
Ying Wang [Tue, 15 Apr 2014 18:36:46 +0000 (11:36 -0700)]
Accomodate to the import syntax in build.prop.
Bug:
14024566
Change-Id: I70b8d3c8cfc968a7f039728375f3f7f341cdc11a
Andrew Hsieh [Tue, 15 Apr 2014 18:54:06 +0000 (11:54 -0700)]
Add -Wl,-maarch64linux
The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with
backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/
The existing ld.bfd is fine because it's configured to support
aarch64linux only. ld.mcld (see https://android-review.googlesource.com/#/c/91047)
needs explicit emulation switch because it supports multiple targets
Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
Ying Wang [Tue, 15 Apr 2014 18:16:08 +0000 (18:16 +0000)]
am
f0534c28: LOCAL_CERTIFICATE only applies to APPS.
* commit '
f0534c289786d6a6c98cc5550f5027e13a5a8bff':
LOCAL_CERTIFICATE only applies to APPS.
Ying Wang [Tue, 15 Apr 2014 18:12:21 +0000 (11:12 -0700)]
LOCAL_CERTIFICATE only applies to APPS.
Change-Id: Iae8c62f1686736f3ce21a2eb6b82fedc9fd12125
Ying Wang [Tue, 15 Apr 2014 16:12:26 +0000 (16:12 +0000)]
am
fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
* commit '
fcd22c8848b829eec7e661fb270fea1a18bcba28':
Allow to build target-files.zip in sdk build.
Ying Wang [Tue, 15 Apr 2014 16:07:03 +0000 (16:07 +0000)]
Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
Narayan Kamath [Tue, 15 Apr 2014 11:06:26 +0000 (11:06 +0000)]
am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
60b9496c016f81df8f1c4202ba8a5190543900d5':
"desktop" linux has Posix clocks.
Narayan Kamath [Tue, 15 Apr 2014 11:02:48 +0000 (11:02 +0000)]
am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
22261a3f9b50dfb567ca072ec7ca2c77fd64e531':
"desktop" linux has Posix clocks.
Narayan Kamath [Tue, 15 Apr 2014 10:58:51 +0000 (10:58 +0000)]
Merge ""desktop" linux has Posix clocks."
Scott Main [Tue, 15 Apr 2014 02:46:17 +0000 (02:46 +0000)]
am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
cdbb12418943889a86576b24ae91ddd6a2b5340e':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:44:48 +0000 (02:44 +0000)]
am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
01adbdcb954e2d694ec40ac149f07c44defcc796':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:42:10 +0000 (02:42 +0000)]
am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
613b251b7b4b54507561ee52811c72fcd2ba731d':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)]
Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
Scott Main [Tue, 15 Apr 2014 02:00:12 +0000 (19:00 -0700)]
remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.
Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
Ying Wang [Tue, 15 Apr 2014 00:25:43 +0000 (17:25 -0700)]
Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.
Bug:
13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
Scott Main [Mon, 14 Apr 2014 15:54:20 +0000 (15:54 +0000)]
am
74e22573: am
78f264f7: am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
74e22573a671f929c4d2daf526d72e49224f934f':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Dirk Dougherty [Mon, 14 Apr 2014 15:54:19 +0000 (15:54 +0000)]
am
7b1fe64c: am
7de9c942: am
45094b5d: am
d0c6f0a1: am
318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '
7b1fe64cfdce0f9492db00771735d39ec94be040':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
Scott Main [Mon, 14 Apr 2014 15:49:36 +0000 (15:49 +0000)]
am
78f264f7: am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
78f264f79be427d4bbe6446c1e4893b1526e76d7':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Dirk Dougherty [Mon, 14 Apr 2014 15:49:19 +0000 (15:49 +0000)]
am
7de9c942: am
45094b5d: am
d0c6f0a1: am
318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '
7de9c94263c48c00b52a9d2feccd51b477aacac1':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
Scott Main [Mon, 14 Apr 2014 15:01:48 +0000 (15:01 +0000)]
am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
3829f62188161fe7528e18de7bb226896611fee0':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Scott Main [Mon, 14 Apr 2014 14:58:17 +0000 (14:58 +0000)]
am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
b1a6d6441a02478569e57a5da5b9655dd1409efa':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Scott Main [Mon, 14 Apr 2014 14:55:13 +0000 (14:55 +0000)]
am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
1670cca5f97d9edfdeaae9a6d65400200e98961c':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Scott Main [Mon, 14 Apr 2014 14:52:32 +0000 (14:52 +0000)]
Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
Dirk Dougherty [Mon, 14 Apr 2014 03:06:37 +0000 (03:06 +0000)]
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.
Dirk Dougherty [Mon, 14 Apr 2014 03:04:01 +0000 (03:04 +0000)]
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.
Dirk Dougherty [Mon, 14 Apr 2014 03:02:02 +0000 (03:02 +0000)]
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.
Dirk Dougherty [Wed, 9 Apr 2014 01:46:53 +0000 (18:46 -0700)]
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
Change-Id: Ib140e7025360d60e6fb49e1e6c45e2c7ccc72cda
Scott Main [Sat, 12 Apr 2014 23:40:48 +0000 (16:40 -0700)]
make the sticky bar aware of search result visiblity.
Fixes a bug that caused the sidenav to overlap search results.
Change-Id: I3dc431f46cd96164dd79f3d0461f5034cc912099
Colin Cross [Sat, 12 Apr 2014 00:18:05 +0000 (00:18 +0000)]
am
87cf2b5b: am
25313cd3: am
59cc3f5d: am
5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '
87cf2b5bec19adaf418704ae3beb9f5a15f07a15':
build: remove LOCAL_NO_2ND_ARCH
Colin Cross [Sat, 12 Apr 2014 00:12:20 +0000 (00:12 +0000)]
am
25313cd3: am
59cc3f5d: am
5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '
25313cd32a78108945d65144399fc292350e9e0a':
build: remove LOCAL_NO_2ND_ARCH
Colin Cross [Sat, 12 Apr 2014 00:09:41 +0000 (00:09 +0000)]
am
59cc3f5d: am
5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '
59cc3f5d2a65d1114b0643c453af8b9249970dfd':
build: remove LOCAL_NO_2ND_ARCH
Colin Cross [Sat, 12 Apr 2014 00:08:19 +0000 (00:08 +0000)]
am
5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '
5b1fa1c8a05618a2c47edc628b2bafe4a9c6c50a':
build: remove LOCAL_NO_2ND_ARCH
Colin Cross [Sat, 12 Apr 2014 00:06:30 +0000 (00:06 +0000)]
Merge "build: remove LOCAL_NO_2ND_ARCH"
Colin Cross [Fri, 11 Apr 2014 23:00:23 +0000 (16:00 -0700)]
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
Ben Cheng [Fri, 11 Apr 2014 23:53:36 +0000 (23:53 +0000)]
am
bdcb4bcd: am
e921da9d: am
bddce34c: am
065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit '
bdcb4bcd7b2384cc77744232e352b38e003e733e':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Ben Cheng [Fri, 11 Apr 2014 23:47:51 +0000 (23:47 +0000)]
am
e921da9d: am
bddce34c: am
065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit '
e921da9def56e6f70de3df18f0582a69826d9787':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Ben Cheng [Fri, 11 Apr 2014 23:44:52 +0000 (23:44 +0000)]
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)"
Ben Cheng [Fri, 11 Apr 2014 23:41:28 +0000 (23:41 +0000)]
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)"
Ben Cheng [Fri, 11 Apr 2014 23:37:44 +0000 (23:37 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
Ben Cheng [Fri, 11 Apr 2014 23:36:25 +0000 (23:36 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This reverts commit
1ae9b213eb5648205223e4b825f4c808a5d2ace8.
Sigh... new warnings found by 4.9 break checkbuild.
Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
Ben Cheng [Fri, 11 Apr 2014 22:50:29 +0000 (22:50 +0000)]
am
2b240a7b: am
c9f9decd: am
4eea070c: am
f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit '
2b240a7bd2754576f3e48332d90310f0685b4660':
Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
Ben Cheng [Fri, 11 Apr 2014 22:44:05 +0000 (22:44 +0000)]
am
c9f9decd: am
4eea070c: am
f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit '
c9f9decdcaa6c3314c11edba0bf9703edf09615e':
Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
Ben Cheng [Fri, 11 Apr 2014 22:40:46 +0000 (22:40 +0000)]
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)
Ben Cheng [Fri, 11 Apr 2014 22:38:37 +0000 (22:38 +0000)]
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)
Ben Cheng [Fri, 11 Apr 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Ben Cheng [Fri, 11 Apr 2014 19:22:56 +0000 (12:22 -0700)]
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
Ben Cheng [Fri, 11 Apr 2014 17:13:32 +0000 (17:13 +0000)]
am
19b7c4d5: am
e4d787bf: am
7e793040: am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
19b7c4d5c906523954e157a0efebf8197fdb1964':
Decouple platform compiler and NDK library versioning.
Ben Cheng [Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)]
am
e4d787bf: am
7e793040: am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
e4d787bfbbde83bc4b868ed804c94118c2ea0080':
Decouple platform compiler and NDK library versioning.
Ben Cheng [Fri, 11 Apr 2014 17:08:22 +0000 (17:08 +0000)]
am
7e793040: am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
7e793040be265c2d221cd83e34a53bc7d011206f':
Decouple platform compiler and NDK library versioning.
Ben Cheng [Fri, 11 Apr 2014 17:05:32 +0000 (17:05 +0000)]
am
eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '
eec11d9727ab0e6bc843f059d5f2921ada2e8e9a':
Decouple platform compiler and NDK library versioning.
Ben Cheng [Fri, 11 Apr 2014 17:02:32 +0000 (17:02 +0000)]
Merge "Decouple platform compiler and NDK library versioning."
Colin Cross [Fri, 11 Apr 2014 10:05:48 +0000 (10:05 +0000)]
am
6c277fac: am
14203772: am
3221717f: am
a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* commit '
6c277faccf37057d60526eb05a2f0d602278b533':
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
Colin Cross [Fri, 11 Apr 2014 10:02:14 +0000 (10:02 +0000)]
am
14203772: am
3221717f: am
a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* commit '
14203772619f4b4740941de634f90b7a02231aa5':
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
Colin Cross [Fri, 11 Apr 2014 09:57:20 +0000 (09:57 +0000)]
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
Scott Main [Fri, 11 Apr 2014 09:03:57 +0000 (09:03 +0000)]
am
e737ca9a: am
7bb8315c: am
4786cc3b: am
de22e6fb: am
20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
* commit '
e737ca9a02658877d5cb186c019ee61640fc4a75':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
Scott Main [Fri, 11 Apr 2014 09:00:56 +0000 (09:00 +0000)]
am
7bb8315c: am
4786cc3b: am
de22e6fb: am
20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
* commit '
7bb8315cf6d0576f8663ced6d102e60112bec27c':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
Scott Main [Fri, 11 Apr 2014 08:57:50 +0000 (08:57 +0000)]
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
Scott Main [Fri, 11 Apr 2014 08:54:39 +0000 (08:54 +0000)]
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
Scott Main [Fri, 11 Apr 2014 08:17:21 +0000 (08:17 +0000)]
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
Colin Cross [Fri, 11 Apr 2014 07:17:10 +0000 (07:17 +0000)]
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
Colin Cross [Fri, 11 Apr 2014 05:50:10 +0000 (05:50 +0000)]
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
Ben Cheng [Fri, 11 Apr 2014 05:46:26 +0000 (22:46 -0700)]
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
Colin Cross [Thu, 10 Apr 2014 18:31:13 +0000 (11:31 -0700)]
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
Colin Cross [Thu, 10 Apr 2014 18:29:05 +0000 (11:29 -0700)]
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
Scott Main [Thu, 3 Apr 2014 04:57:20 +0000 (21:57 -0700)]
update sticky nav to sync with sidenav
and build the breadcrumbs dynamically
Change-Id: Ib008d4606a8e82c468be75c051a8a9e623dc7c22
Colin Cross [Thu, 10 Apr 2014 18:28:04 +0000 (11:28 -0700)]
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
Colin Cross [Thu, 10 Apr 2014 19:28:56 +0000 (12:28 -0700)]
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
Colin Cross [Thu, 10 Apr 2014 20:25:39 +0000 (20:25 +0000)]
am
bde0c5a4: am
fa75d63c: am
dbf1f804: am
80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit '
bde0c5a42abf516928a0dd2008912a42962cbcca':
gdbclient: use 64-bit suffix for all library symbols
Colin Cross [Thu, 10 Apr 2014 20:22:19 +0000 (20:22 +0000)]
am
fa75d63c: am
dbf1f804: am
80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit '
fa75d63cd7d512871e7f6038bfc75b19560dae2a':
gdbclient: use 64-bit suffix for all library symbols
Colin Cross [Thu, 10 Apr 2014 20:20:09 +0000 (20:20 +0000)]
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
Colin Cross [Thu, 10 Apr 2014 20:17:09 +0000 (20:17 +0000)]
am
80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit '
80f7dbd4deb0a765eaf4a697ea3bcc2e5f2c5b3b':
gdbclient: use 64-bit suffix for all library symbols
Colin Cross [Thu, 10 Apr 2014 20:15:21 +0000 (20:15 +0000)]
Merge "gdbclient: use 64-bit suffix for all library symbols"
Colin Cross [Thu, 10 Apr 2014 19:51:39 +0000 (12:51 -0700)]
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
Ben Cheng [Thu, 10 Apr 2014 17:26:57 +0000 (17:26 +0000)]
am
335c76d8: am
c77ffa89: am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
335c76d886b7e4ea241f3c02bab2cf38074fe9e4':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:24:46 +0000 (17:24 +0000)]
am
c77ffa89: am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
c77ffa8923d95f8bd4639bf9e810b0c981481e54':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:21:49 +0000 (17:21 +0000)]
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."