Commit Graph

16506 Commits

Author SHA1 Message Date
Ying Wang 51f0d3f58a resolved conflicts for merge of 70555a16 to master
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
2014-04-15 13:55:24 -07:00
Narayan Kamath a1f8afa930 am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit 'd954c6b92024fbb183ea3acb7366a39765a6e3c0':
  "desktop" linux has Posix clocks.
2014-04-15 20:52:52 +00:00
Scott Main e65e213444 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.
2014-04-15 20:52:27 +00:00
Ying Wang 114b46f15d Accomodate to the import syntax in build.prop.
Bug: 14024566
Change-Id: I71692244fabcd4d12f65849ffa027295b3a2a79a
(cherry picked from commit 092fea0d3e644573d7f0dbfe6692f42431f83c5c)
2014-04-15 20:28:53 +00:00
Ying Wang 5a7ad0338b Accomodate to the import syntax in build.prop.
Bug: 14024566
Change-Id: I70b8d3c8cfc968a7f039728375f3f7f341cdc11a
2014-04-15 12:37:13 -07:00
Ying Wang f0534c2897 LOCAL_CERTIFICATE only applies to APPS.
Change-Id: Iae8c62f1686736f3ce21a2eb6b82fedc9fd12125
2014-04-15 11:12:21 -07:00
Ying Wang 70555a1677 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.
2014-04-15 16:12:26 +00:00
Ying Wang fcd22c8848 Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev 2014-04-15 16:07:04 +00:00
Narayan Kamath d954c6b920 am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '60b9496c016f81df8f1c4202ba8a5190543900d5':
  "desktop" linux has Posix clocks.
2014-04-15 11:06:26 +00:00
Narayan Kamath 60b9496c01 am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '22261a3f9b50dfb567ca072ec7ca2c77fd64e531':
  "desktop" linux has Posix clocks.
2014-04-15 11:02:48 +00:00
Narayan Kamath 22261a3f9b Merge ""desktop" linux has Posix clocks." 2014-04-15 10:58:52 +00:00
Scott Main 554bb7b610 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.
2014-04-15 02:46:17 +00:00
Scott Main cdbb124189 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.
2014-04-15 02:44:48 +00:00
Scott Main 01adbdcb95 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.
2014-04-15 02:42:10 +00:00
Scott Main 613b251b7b Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs 2014-04-15 02:38:35 +00:00
Scott Main 4868e9bf92 remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.

Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
2014-04-14 19:00:12 -07:00
Ying Wang 4709d7c3a5 Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.

Bug: 13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
2014-04-14 17:25:43 -07:00
Scott Main 74e22573a6 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.
2014-04-14 15:49:36 +00:00
Dirk Dougherty 7b1fe64cfd 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.
2014-04-14 15:49:19 +00:00
Scott Main 78f264f79b 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.
2014-04-14 15:01:48 +00:00
Scott Main 3829f62188 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.
2014-04-14 14:58:17 +00:00
Scott Main b1a6d6441a 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.
2014-04-14 14:55:13 +00:00
Scott Main 1670cca5f9 Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs 2014-04-14 14:52:32 +00:00
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
Scott Main d6a8e662cf make the sticky bar aware of search result visiblity.
Fixes a bug that caused the sidenav to overlap search results.

Change-Id: I3dc431f46cd96164dd79f3d0461f5034cc912099
2014-04-12 16:40:48 -07:00
Colin Cross 87cf2b5bec am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '25313cd32a78108945d65144399fc292350e9e0a':
  build: remove LOCAL_NO_2ND_ARCH
2014-04-12 00:12:20 +00: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 bdcb4bcd7b 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)"
2014-04-11 23:47:51 +00: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 2b240a7bd2 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)
2014-04-11 22:44:05 +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 19b7c4d5c9 am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit 'e4d787bfbbde83bc4b868ed804c94118c2ea0080':
  Decouple platform compiler and NDK library versioning.
2014-04-11 17:10:37 +00: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 6c277faccf 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
2014-04-11 10:02:14 +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 e737ca9a02 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
2014-04-11 09:00:56 +00:00