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
Daniel Rosenberg
dde3184ae8
Added variables to support seperate vendor patition.
...
Change-Id: I73cc76697e138aa8ce1273d410391d55c8d7f34f
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-05-29 15:42:27 -07: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
Brian Carlstrom
bf8a374a92
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
2014-05-28 21:27:47 -07:00
Ying Wang
e8787b9770
am 1ef0a635
: Fix pattern rules for for libdvm.
...
* commit '1ef0a635f370acf22c8a23ec608d8d03508274ba':
Fix pattern rules for $(installed_odex) for libdvm.
2014-05-29 00:42:11 +00:00
Ying Wang
8b73a86834
am 834ec0ea
: am d3ddfdf8
: am b3bed595
: Merge "Add a dummy build recipe for generated RS cpp files."
...
* commit '834ec0ead591cf64a5f660af0210e95728e08c4f':
Add a dummy build recipe for generated RS cpp files.
2014-05-28 23:45:29 +00:00
Ying Wang
834ec0ead5
am d3ddfdf8
: am b3bed595
: Merge "Add a dummy build recipe for generated RS cpp files."
...
* commit 'd3ddfdf847eaf44219943cda441273be85b01635':
Add a dummy build recipe for generated RS cpp files.
2014-05-28 23:41:42 +00:00
Ying Wang
d3ddfdf847
am b3bed595
: Merge "Add a dummy build recipe for generated RS cpp files."
...
* commit 'b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
2014-05-28 23:38:46 +00:00
Ying Wang
b3bed5952b
Merge "Add a dummy build recipe for generated RS cpp files."
2014-05-28 23:33:35 +00:00
Ying Wang
2823ee9942
am f0c41848
: am d40776aa
: am 65afd710
: Merge "Add a dummy build recipe for the proto generated header files"
...
* commit 'f0c4184852f919d2f2128a1c4fd2dc4405b37c1b':
Add a dummy build recipe for the proto generated header files
2014-05-28 23:33:07 +00:00
Ying Wang
f0c4184852
am d40776aa
: am 65afd710
: Merge "Add a dummy build recipe for the proto generated header files"
...
* commit 'd40776aa8800d62a182eeed82c3ac1cef90e69ab':
Add a dummy build recipe for the proto generated header files
2014-05-28 23:31:02 +00:00
Ying Wang
d40776aa88
am 65afd710
: Merge "Add a dummy build recipe for the proto generated header files"
...
* commit '65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
2014-05-28 23:28:58 +00:00
Ying Wang
65afd710a5
Merge "Add a dummy build recipe for the proto generated header files"
2014-05-28 23:26:01 +00:00
Brian Carlstrom
4445b1bd98
am 9843e863
: am ed97938c
: am 7df64f7c
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '9843e863953a2e1b7f38f0beab294d2c9d12a868':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:18:51 +00:00
Ying Wang
81ab8339fe
Add a dummy build recipe for generated RS cpp files.
...
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug: 15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
2014-05-28 16:17:09 -07:00
Ying Wang
5186dac02b
Add a dummy build recipe for the proto generated header files
...
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug: 13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
2014-05-28 16:15:13 -07:00
Brian Carlstrom
9843e86395
am ed97938c
: am 7df64f7c
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:28 +00:00
Brian Carlstrom
ee26bf6a84
resolved conflicts for merge of 7e127ebe
to master
...
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
2014-05-28 16:02:45 -07:00
Brian Carlstrom
ed97938caa
am 7df64f7c
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:44 +00:00
Brian Carlstrom
7df64f7c0d
Merge "Move to dalvik.vm.lib.2 to force default to libart"
2014-05-28 22:28:35 +00:00
Ying Wang
1ef0a635f3
Fix pattern rules for $(installed_odex) for libdvm.
...
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug: 15311527
(cherry picked from commit 994c226b91
)
Change-Id: I5469ef1994f2ba91a9c25126349156752fc35b4b
2014-05-28 15:09:55 -07:00