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
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
Scott Main
573db58ef7
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 'ea98c8413390cf228d4c16fc35a7fdc92109eded':
update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:42:16 +00:00
Scott Main
ea98c84133
Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
2014-05-29 22:33:55 +00:00
Dave Allison
7127da62c8
am faa2d249
: am f4115cdf
: am 2a2ba735
: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit 'faa2d24991682e31804f8cfcdc16a4f09fb4dbad':
Add libsigchain to the embedded.mk makefile
2014-05-29 21:09:56 +00:00
Brian Carlstrom
a9113b140a
am c93c0308
: am ab6f84e3
: am e0df9d95
: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
...
* commit 'c93c03081bd86bc003bc0eb0655d82e20503cd17':
Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 21:09:55 +00:00
Brian Carlstrom
028fd5ba79
am 8fe9c76d
: resolved conflicts for merge of 2267c22b
to klp-modular-dev-plus-aosp
...
* commit '8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 21:09:54 +00:00
Dave Allison
faa2d24991
am f4115cdf
: am 2a2ba735
: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit 'f4115cdfac6bfde8e3d7cab1e7782d078d764209':
Add libsigchain to the embedded.mk makefile
2014-05-29 21:06:26 +00:00
Brian Carlstrom
c93c03081b
am ab6f84e3
: am e0df9d95
: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
...
* commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 21:06:19 +00:00
Brian Carlstrom
8fe9c76d9a
resolved conflicts for merge of 2267c22b
to klp-modular-dev-plus-aosp
...
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
2014-05-29 14:01:24 -07:00
Vineeta Srivastava
3b06789001
Merge "add moto to vendor owner whitelist"
2014-05-29 20:53:43 +00:00
Stephen Smalley
5520f28653
Use a separate policy for the recovery image.
...
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.
Depends on the change with the same Change-Id in external/sepolicy.
Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-29 16:42:49 -04:00
Dave Allison
f4115cdfac
am 2a2ba735
: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit '2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
2014-05-29 19:57:50 +00:00
Dave Allison
2a2ba735df
Merge "Add libsigchain to the embedded.mk makefile"
2014-05-29 19:51:50 +00:00
Brian Carlstrom
ab6f84e3d1
am e0df9d95
: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
...
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 19:40:02 +00:00
Brian Carlstrom
2267c22b3d
am f2a2406b
: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:49 +00:00
Brian Carlstrom
e0df9d9577
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
2014-05-29 19:36:38 +00:00
Brian Carlstrom
f2a2406b8c
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
2014-05-29 19:36:35 +00:00
Andrew Hsieh
4c952d72b7
Add -latomic to all target builds
...
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.
Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.
Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
2014-05-29 11:40:46 -07:00
Brian Carlstrom
3f5ff08dc5
Only enable WITH_DEXPREOPT by default for libdvm.so
...
Bug: 14298175
(cherry picked from commit 9f8e214a91
)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
2014-05-29 09:38:04 -07:00
Brian Carlstrom
1e60fe58f0
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit bf8a374a92
)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
2014-05-29 09:37:25 -07:00
Brian Carlstrom
e469ea36ff
am 9f8e214a
: Only enable WITH_DEXPREOPT by default for libdvm.so
...
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
Only enable WITH_DEXPREOPT by default for libdvm.so
2014-05-29 16:37:20 +00:00
Brian Carlstrom
5da48a3394
am bf8a374a
: Remove dependencies on runtime_libdvm and libdvm.so in general
...
* commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 16:37:19 +00:00
Brian Carlstrom
9f8e214a91
Only enable WITH_DEXPREOPT by default for libdvm.so
...
Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
2014-05-28 22:13:07 -07:00