OSDN Git Service
Steve Moyer [Wed, 4 Jun 2014 17:28:52 +0000 (17:28 +0000)]
am
c653faa8: (-s ours) am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
c653faa88717b0ca5e97b39a4016399d7a67549f':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 17:28:51 +0000 (17:28 +0000)]
am
1e1681db: (-s ours) am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
1e1681db51e87c08b88dd5ffd961eb815b5aeb86':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 16:55:53 +0000 (16:55 +0000)]
am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
37773821f150778c48ef3519407d8ee71dd66a30':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 16:55:52 +0000 (16:55 +0000)]
am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
008dc16cb06976620c0fa1e51942f2d1c6af54f3':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Dirk Dougherty [Tue, 3 Jun 2014 23:18:12 +0000 (23:18 +0000)]
am
cfdf93c0: am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
cfdf93c003a7afc18eb9a79921abf7b472e6d745':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:14:41 +0000 (23:14 +0000)]
am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
201cdd30e07ecddb333b4e347fbf14493fd2643c':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:10:24 +0000 (23:10 +0000)]
am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
600e588e9902c4bf3e0fd567a9338a5381249ba3':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:08:13 +0000 (23:08 +0000)]
Merge "css adjustments for headings with dynamic content" into klp-docs
Dirk Dougherty [Tue, 3 Jun 2014 23:03:22 +0000 (23:03 +0000)]
am
e473e9bd: am
706bb0eb: am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
e473e9bdc95b7f962d30d577975411b106b0eafe':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 23:01:49 +0000 (23:01 +0000)]
am
706bb0eb: am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
706bb0eb6455a7775596a87c9d515113e227c571':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 22:59:49 +0000 (22:59 +0000)]
am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
44b740e7e556f60b36a45a4a386157f55981df8e':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 22:56:50 +0000 (22:56 +0000)]
Merge "Add universal analytics code." into klp-docs
Scott Main [Tue, 3 Jun 2014 18:06:39 +0000 (18:06 +0000)]
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.
Primiano Tucci [Tue, 3 Jun 2014 13:13:43 +0000 (13:13 +0000)]
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.
Primiano Tucci [Tue, 3 Jun 2014 09:29:50 +0000 (09:29 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
Scott Main [Tue, 3 Jun 2014 02:15:56 +0000 (02:15 +0000)]
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.
Scott Main [Tue, 3 Jun 2014 02:12:01 +0000 (02:12 +0000)]
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.
Dirk Dougherty [Tue, 3 Jun 2014 02:02:18 +0000 (19:02 -0700)]
Add universal analytics code.
Change-Id: I3b565a1cd422c5cbd3da8560e533741b880615a7
Scott Main [Tue, 3 Jun 2014 02:06:33 +0000 (02:06 +0000)]
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
Ying Wang [Tue, 3 Jun 2014 01:25:23 +0000 (01:25 +0000)]
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
Ying Wang [Tue, 3 Jun 2014 01:22:51 +0000 (01:22 +0000)]
am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
40b7e34240be756bbf1542b63eef6332024d067e':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:20:29 +0000 (01:20 +0000)]
Merge "Move sdk staging dir to a product-specific dir"
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.
Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
Nick Kralevich [Mon, 2 Jun 2014 19:27:04 +0000 (19:27 +0000)]
am
333005f1: am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:25:21 +0000 (19:25 +0000)]
am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
c706ea79629792f4432774643887f5681e8f145d':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:23:11 +0000 (19:23 +0000)]
Merge "Include selinux_version file with builds."
Primiano Tucci [Mon, 2 Jun 2014 16:37:38 +0000 (17:37 +0100)]
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
Dirk Dougherty [Mon, 2 Jun 2014 04:28:20 +0000 (21:28 -0700)]
css adjustments for headings with dynamic content
Change-Id: I54e184b10677b21003bd282919423b525b8aa705
Dirk Dougherty [Sat, 31 May 2014 16:57:01 +0000 (16:57 +0000)]
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.
Dirk Dougherty [Sat, 31 May 2014 11:44:03 +0000 (11:44 +0000)]
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.
Dirk Dougherty [Sat, 31 May 2014 11:09:48 +0000 (11:09 +0000)]
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.
Dirk Dougherty [Sat, 31 May 2014 04:24:42 +0000 (21:24 -0700)]
Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
Stephen Hines [Fri, 30 May 2014 23:08:50 +0000 (23:08 +0000)]
am
85e0dce5: am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
85e0dce5f49bfcad97494a674f8a50219914962a':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 23:04:37 +0000 (23:04 +0000)]
am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 22:59:48 +0000 (22:59 +0000)]
Merge "Add -shared to clang LDFLAGS."
Nick Kralevich [Fri, 30 May 2014 22:59:28 +0000 (22:59 +0000)]
am
329988c2: am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
329988c277553621c40bbfff85e9848783992040':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:56:11 +0000 (22:56 +0000)]
am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
a42e0f50162721bc54c113ef1ed3058cfb38ae67':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:52:34 +0000 (22:52 +0000)]
Merge "arm64: restore relro/now"
Nick Kralevich [Fri, 30 May 2014 22:45:24 +0000 (15:45 -0700)]
arm64: restore relro/now
The bug which required this option has been fixed.
Bug:
11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
Scott Main [Fri, 30 May 2014 18:23:00 +0000 (11:23 -0700)]
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
Nick Kralevich [Fri, 30 May 2014 18:27:03 +0000 (18:27 +0000)]
am
1df5b37b: am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
1df5b37b5b73324300ae1b5f255c1a772c65328a':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:23:41 +0000 (18:23 +0000)]
am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
61cf065ae9247a200208dc7df0234e03caff3605':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:20:48 +0000 (18:20 +0000)]
Merge "Use a separate policy for the recovery image."
Andrew Hsieh [Fri, 30 May 2014 07:56:53 +0000 (07:56 +0000)]
am
dc41aa32: am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
dc41aa3254cbf443dd08c827e587cf261d1f7b82':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:46:14 +0000 (07:46 +0000)]
am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
5c2c70de88a6c126460c88cfa64561d7cb2cc030':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:44:00 +0000 (07:44 +0000)]
Merge "Add -latomic to all target builds"
Tim Murray [Thu, 29 May 2014 22:10:44 +0000 (15:10 -0700)]
Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.
Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
Scott Main [Thu, 29 May 2014 22:59:57 +0000 (22:59 +0000)]
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
Scott Main [Thu, 29 May 2014 22:54:12 +0000 (22:54 +0000)]
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
Scott Main [Thu, 29 May 2014 22:42:16 +0000 (22:42 +0000)]
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
Scott Main [Thu, 29 May 2014 22:33:55 +0000 (22:33 +0000)]
Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
Dave Allison [Thu, 29 May 2014 21:06:26 +0000 (21:06 +0000)]
am
f4115cdf: am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
f4115cdfac6bfde8e3d7cab1e7782d078d764209':
Add libsigchain to the embedded.mk makefile
Brian Carlstrom [Thu, 29 May 2014 21:06:19 +0000 (21:06 +0000)]
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
Brian Carlstrom [Thu, 29 May 2014 21:01:24 +0000 (14:01 -0700)]
resolved conflicts for merge of
2267c22b to klp-modular-dev-plus-aosp
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
Stephen Smalley [Thu, 29 May 2014 20:41:03 +0000 (16:41 -0400)]
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>
Dave Allison [Thu, 29 May 2014 19:57:50 +0000 (19:57 +0000)]
am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
Dave Allison [Thu, 29 May 2014 19:51:50 +0000 (19:51 +0000)]
Merge "Add libsigchain to the embedded.mk makefile"
Brian Carlstrom [Thu, 29 May 2014 19:40:02 +0000 (19:40 +0000)]
am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 19:39:49 +0000 (19:39 +0000)]
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
Brian Carlstrom [Thu, 29 May 2014 19:36:37 +0000 (19:36 +0000)]
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
Brian Carlstrom [Thu, 29 May 2014 19:36:35 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Andrew Hsieh [Thu, 29 May 2014 09:47:27 +0000 (02:47 -0700)]
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
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
(cherry picked from commit
9f8e214a919097284a88cb19a1b85ceafc202a67)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
bf8a374a92e327efed95892fe67e6917a89c6c2b)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
Ying Wang [Wed, 28 May 2014 23:41:42 +0000 (23:41 +0000)]
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.
Ying Wang [Wed, 28 May 2014 23:38:46 +0000 (23:38 +0000)]
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.
Ying Wang [Wed, 28 May 2014 23:33:35 +0000 (23:33 +0000)]
Merge "Add a dummy build recipe for generated RS cpp files."
Ying Wang [Wed, 28 May 2014 23:31:02 +0000 (23:31 +0000)]
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
Ying Wang [Wed, 28 May 2014 23:28:58 +0000 (23:28 +0000)]
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
Ying Wang [Wed, 28 May 2014 23:26:01 +0000 (23:26 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Ying Wang [Wed, 28 May 2014 23:17:09 +0000 (16:17 -0700)]
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
Ying Wang [Fri, 14 Feb 2014 02:04:00 +0000 (18:04 -0800)]
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
Brian Carlstrom [Wed, 28 May 2014 23:13:28 +0000 (23:13 +0000)]
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
Brian Carlstrom [Wed, 28 May 2014 22:31:44 +0000 (22:31 +0000)]
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
Brian Carlstrom [Wed, 28 May 2014 22:28:35 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:46 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
7e127ebe0bf8753fcbeeac6140916d512322e308)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
Ying Wang [Wed, 28 May 2014 21:31:19 +0000 (21:31 +0000)]
am
8898f2e2: am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
8898f2e261d1bb2b389971803a1f4a23639ade9e':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:28:42 +0000 (21:28 +0000)]
am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
f4999d3b8a0d09e790767176c543df1c2ad53c5a':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:25:34 +0000 (21:25 +0000)]
Merge "Fix pattern rules for $(installed_odex) for libdvm."
Ying Wang [Wed, 28 May 2014 20:34:59 +0000 (13:34 -0700)]
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
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
Ying Wang [Wed, 28 May 2014 16:18:56 +0000 (16:18 +0000)]
am
7e4c73d5: am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
7e4c73d5885402f5c301309094ce3dbceef0ecd3':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:14:54 +0000 (16:14 +0000)]
am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:12:39 +0000 (16:12 +0000)]
Merge "Support LOCAL_CLANG with arch/bit suffix."
Elliott Hughes [Wed, 28 May 2014 04:07:39 +0000 (04:07 +0000)]
am
ad319779: am
4afe808c: Merge "Fix all the system image sizes."
* commit '
ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:04:36 +0000 (04:04 +0000)]
am
4afe808c: Merge "Fix all the system image sizes."
* commit '
4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:01:52 +0000 (04:01 +0000)]
Merge "Fix all the system image sizes."
Elliott Hughes [Tue, 27 May 2014 23:47:44 +0000 (16:47 -0700)]
Fix all the system image sizes.
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.
Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
Ying Wang [Tue, 27 May 2014 20:03:36 +0000 (13:03 -0700)]
Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.
Bug:
15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
Dan Albert [Tue, 27 May 2014 19:47:08 +0000 (19:47 +0000)]
am
a5b0b130: am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
a5b0b1303d38fb1cd31575383c647eb8b1db5e36':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:44:19 +0000 (19:44 +0000)]
am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
3805f619156163eab8ad92fd51b4a431be1287bd':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:41:46 +0000 (19:41 +0000)]
Merge "Revert "Fix for duplicate names in whole static libs""
Dan Albert [Tue, 27 May 2014 19:30:36 +0000 (19:30 +0000)]
Revert "Fix for duplicate names in whole static libs"
This reverts commit
0e5ce8be34446278a3404ea2a4afc01f20f86c5a.
Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
Dan Albert [Tue, 27 May 2014 18:30:08 +0000 (18:30 +0000)]
am
212772f6: am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
212772f6322ef41a1b18023d15eb2b69efa19be8':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:26:38 +0000 (18:26 +0000)]
am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
31101623b3e621436f6b46f49242ed4642d86164':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:23:26 +0000 (18:23 +0000)]
Merge "Fix for duplicate names in whole static libs"
Ying Wang [Tue, 27 May 2014 17:55:35 +0000 (17:55 +0000)]
am
29267309: am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
292673094c59bf235a8ba188c2736199f6082105':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:52:10 +0000 (17:52 +0000)]
am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
294301bb34b62d51305d70780ac031a905fa9efe':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:49:12 +0000 (17:49 +0000)]
Merge "Exclude libstdc++ and libgcc if libc++ is requested."