Commit graph

18447 commits

Author SHA1 Message Date
Michael Runge
4eb9e61c24 Merge "Add sprout support to signing tools" 2014-06-03 22:32:38 +00:00
Michael Runge
dc2661afe2 Add sprout support to signing tools
Bug: 15379701

Change-Id: Ied8329e1162250cc5509b65ef8bf0b5a9ddda3c3
2014-06-03 15:30:40 -07:00
Scott Main
6683556dfb am 5ffee03c: am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '5ffee03c8573ab404a7b466bf64a8254665d8efc':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:14:09 +00:00
Scott Main
5ffee03c85 am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '88c6d8d33e8b5532e3b6c940cc044454fcea206a':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:06:39 +00:00
Primiano Tucci
490b84a930 am b641702c: am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit 'b641702c0807af43eae3357df0c84a9c9d4fd744':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
2014-06-03 13:20:03 +00:00
Primiano Tucci
b641702c08 am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit '1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
2014-06-03 13:13:43 +00:00
Primiano Tucci
454de52c96 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

(cherry-picked from AOSP 994c84fb40)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-03 12:24:22 +01:00
Primiano Tucci
1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Scott Main
88c6d8d33e am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '8c02b1ac514b5757aad7d2736ed97bcbff7c7d58':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:15:56 +00:00
Scott Main
8c02b1ac51 am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '7a7abbdb101cd1094e5c2a72a4733e4800824c76':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:12:01 +00:00
Scott Main
7a7abbdb10 Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs 2014-06-03 02:06:33 +00:00
Ying Wang
9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:27:55 +00:00
Ying Wang
dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:25:23 +00:00
Ying Wang
7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:22:51 +00:00
Ying Wang
40b7e34240 Merge "Move sdk staging dir to a product-specific dir" 2014-06-03 01:20:30 +00:00
Ying Wang
d7af176199 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
2014-06-02 16:16:53 -07:00
Nick Kralevich
e2618cdc52 am 362d2d41: am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
* commit '362d2d4123a755a3e39a2015cf49da7db24a26ad':
  Include selinux_version file with builds.
2014-06-02 19:29:10 +00:00
Nick Kralevich
362d2d4123 am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
* commit '333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
  Include selinux_version file with builds.
2014-06-02 19:27:04 +00:00
Nick Kralevich
333005f1bf am c706ea79: Merge "Include selinux_version file with builds."
* commit 'c706ea79629792f4432774643887f5681e8f145d':
  Include selinux_version file with builds.
2014-06-02 19:25:21 +00:00
Nick Kralevich
c706ea7962 Merge "Include selinux_version file with builds." 2014-06-02 19:23:12 +00:00
Primiano Tucci
994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-02 20:12:57 +01:00
Dirk Dougherty
0da4cd8974 am 93d62e61: am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '93d62e613221f92a68846523616028fa922a0f43':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 17:02:00 +00:00
Dirk Dougherty
93d62e6132 am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e445387e560f7116087a327d43405f24c9e3ff08':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 16:57:01 +00:00
Dirk Dougherty
e445387e56 am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e2adcfefd32338cacd9837ba18e310f7c647e766':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:44:03 +00:00
Dirk Dougherty
e2adcfefd3 am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '518ed145b17ad1fa66a0b8238469b6d13819f008':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:09:48 +00:00
Dirk Dougherty
518ed145b1 Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
2014-05-30 21:24:42 -07:00
Stephen Hines
88bd5edaa4 am 15d49c3b: am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '15d49c3b30d320422d0209c8726eb0c5cec92d41':
  Add -shared to clang LDFLAGS.
2014-05-30 23:15:43 +00:00
Stephen Hines
15d49c3b30 am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '85e0dce5f49bfcad97494a674f8a50219914962a':
  Add -shared to clang LDFLAGS.
2014-05-30 23:08:50 +00:00
Stephen Hines
85e0dce5f4 am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit 'a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
  Add -shared to clang LDFLAGS.
2014-05-30 23:04:37 +00:00
Nick Kralevich
43c36c8201 am ee7493cc: am 329988c2: am a42e0f50: Merge "arm64: restore relro/now"
* commit 'ee7493ccb91256e61414e8e0bad8d7173cb5d22e':
  arm64: restore relro/now
2014-05-30 23:02:54 +00:00
Stephen Hines
a8b65126ca Merge "Add -shared to clang LDFLAGS." 2014-05-30 22:59:48 +00:00
Nick Kralevich
ee7493ccb9 am 329988c2: am a42e0f50: Merge "arm64: restore relro/now"
* commit '329988c277553621c40bbfff85e9848783992040':
  arm64: restore relro/now
2014-05-30 22:59:28 +00:00
Nick Kralevich
329988c277 am a42e0f50: Merge "arm64: restore relro/now"
* commit 'a42e0f50162721bc54c113ef1ed3058cfb38ae67':
  arm64: restore relro/now
2014-05-30 22:56:11 +00:00
Nick Kralevich
a42e0f5016 Merge "arm64: restore relro/now" 2014-05-30 22:52:35 +00:00
Nick Kralevich
45545761d2 arm64: restore relro/now
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
2014-05-30 15:46:40 -07:00
Nick Kralevich
bf9f0712f2 am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.
2014-05-30 19:01:37 +00:00
Scott Main
06f3f2c148 fix bug in chrome with anchors not scrolling into view on new pages.
added a 100ms delay to the scroll offset because chrome does not
immediately scroll the page to the anchor on page load.

Change-Id: Ib10cfecfe63d9d9220170842f4c8941557c0eb06
2014-05-30 11:42:23 -07:00
Nick Kralevich
46c48a0c34 am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.
2014-05-30 18:27:03 +00:00
Nick Kralevich
1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
2014-05-30 18:23:41 +00:00
Nick Kralevich
61cf065ae9 Merge "Use a separate policy for the recovery image." 2014-05-30 18:20:48 +00:00
Andrew Hsieh
4e5c08d420 am fb0a19d6: am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds"
* commit 'fb0a19d603b0f2c00ec3491a39d37103496cbca9':
  Add -latomic to all target builds
2014-05-30 11:50:52 +00:00
Andrew Hsieh
fb0a19d603 am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds"
* commit 'dc41aa3254cbf443dd08c827e587cf261d1f7b82':
  Add -latomic to all target builds
2014-05-30 07:56:53 +00:00
Andrew Hsieh
dc41aa3254 am 5c2c70de: Merge "Add -latomic to all target builds"
* commit '5c2c70de88a6c126460c88cfa64561d7cb2cc030':
  Add -latomic to all target builds
2014-05-30 07:46:14 +00:00
Andrew Hsieh
5c2c70de88 Merge "Add -latomic to all target builds" 2014-05-30 07:44:02 +00:00
Ying Wang
21e9474252 am b541ab6c: Support to build 64-bit unbundled binaries.
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
  Support to build 64-bit unbundled binaries.
2014-05-30 01:02:44 +00:00
Ying Wang
b541ab6c51 Support to build 64-bit unbundled binaries.
Change-Id: I4656c983d60aaf535ce4d14528c28ae8cef98fd8
2014-05-29 17:57:40 -07:00
Tim Murray
0f9276d4ba Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.

Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
2014-05-29 17:54:07 -07:00
Scott Main
9e4dbb5a16 am e39d7b63: am 04f811c8: am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit 'e39d7b63e40c8664827159d29842ac206a7e478f':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 23:04:25 +00:00
Scott Main
e39d7b63e4 am 04f811c8: am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '04f811c80e2d32e88f73b7d7866da1e9ed699786':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:59:57 +00:00
Scott Main
04f811c80e am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '573db58ef78a1cd80845204c6e5141a6205aa305':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:54:12 +00:00