OSDN Git Service
Jean-Philippe Lesot [Wed, 21 Jan 2015 13:52:48 +0000 (13:52 +0000)]
Merge "Revert "Use Jack to check build""
Narayan Kamath [Wed, 21 Jan 2015 11:04:22 +0000 (11:04 +0000)]
Revert "Running jarjar on Java resources."
This reverts commit
140274707e31c9585aa28b0de2f1418c64ecd272.
Breaks the build on uiautomator_compat.
Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
Ying Wang [Wed, 14 Jan 2015 22:23:56 +0000 (14:23 -0800)]
Running jarjar on Java resources.
Before this change, Java resources are added as a separate step
(add-java-resources-to-package) after dex is run, so jarjar isn't run on
the resource files.
With this change, we add Java resources immediately after we call javac,
so jarjar is run on the resource files (the module's own resource, as
well as resources carried by static Java libraries).
When we generate the final apk/jar, we use the jarjar'ed jar as the
inital pacakge file, with class files and empty folders removed.
When jack is enabled, in jack-java-to-dex we add the Java resources to
a temp jar using the PRIVATE_EXTRA_JAR_ARGS, and extrac the files in a
temp dir. Jack will process the resource files and output the result to
PRIVATE_JACK_INTERMEDIATES_DIR. When we package the final apk/jar, we
need to call add-carried-jack-resources to readd the resources.
(TODO: if jack can output all resources to a jar/zip file, we can use
that file as the initial package file as well.)
Bug:
18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
Jean-Philippe Lesot [Tue, 20 Jan 2015 14:18:48 +0000 (14:18 +0000)]
Revert "Use Jack to check build"
This reverts commit
8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d.
This CL also impacts standard targets. With Jack enabled, a global
'make' without that CL produce ~287 dex files, with this CL, it
produces ~697 dex files.
Bug:
19069325
Change-Id: I39853da0cba8226f31037733edc420507d76c8c0
Jean-Philippe Lesot [Mon, 19 Jan 2015 10:03:20 +0000 (10:03 +0000)]
Merge "Add clean targets removing jack and dex files"
Ying Wang [Fri, 16 Jan 2015 20:06:46 +0000 (20:06 +0000)]
am
c0ff83ae: am
17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
* commit '
c0ff83aebd4ce2ac80247f9b809c27fbf4fc1524':
[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
Dirk Dougherty [Fri, 16 Jan 2015 20:06:35 +0000 (20:06 +0000)]
am
4433ac85: am
d1283889: am
48141e05: am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
4433ac859c90192914c31f3f8d39230aac41852c':
Add new subtab under Distribute tab.
Ying Wang [Fri, 16 Jan 2015 18:32:18 +0000 (18:32 +0000)]
am
17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
* commit '
17967eb72f0eb7f495800d5065b64db4a0174362':
[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
Dirk Dougherty [Fri, 16 Jan 2015 18:17:59 +0000 (18:17 +0000)]
am
d1283889: am
48141e05: am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
d12838890563b2fb4532630373760a995970f687':
Add new subtab under Distribute tab.
Ying Wang [Fri, 16 Jan 2015 18:13:35 +0000 (18:13 +0000)]
Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
Duane Sand [Sat, 8 Nov 2014 23:25:18 +0000 (15:25 -0800)]
[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
Change-Id: Ice2d0f65eced4fb7dd209fb15610ba555dd45f2c
Dirk Dougherty [Fri, 16 Jan 2015 18:11:03 +0000 (18:11 +0000)]
am
48141e05: am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
48141e05994ce939b2becab40d86482bda3d9090':
Add new subtab under Distribute tab.
Dirk Dougherty [Fri, 16 Jan 2015 18:03:42 +0000 (18:03 +0000)]
am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
Miao Wang [Fri, 16 Jan 2015 16:50:16 +0000 (16:50 +0000)]
am
eb66dc39: am
62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
* commit '
eb66dc39a9ec4d62fc65e3c43586dd03a86566cb':
Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
Miao Wang [Fri, 16 Jan 2015 16:50:15 +0000 (16:50 +0000)]
am
50ef9040: am
2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
* commit '
50ef904068c37792015040c1c28a117fafe328a6':
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
Miao Wang [Fri, 16 Jan 2015 16:44:17 +0000 (16:44 +0000)]
am
62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
* commit '
62d49dc5db94a5452b87aa3b31cb623987356f51':
Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
Miao Wang [Fri, 16 Jan 2015 16:44:15 +0000 (16:44 +0000)]
am
2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
* commit '
2b942f87f6b74ad9c5381fa96dcb1d46f155779b':
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
Miao Wang [Fri, 16 Jan 2015 16:34:15 +0000 (16:34 +0000)]
Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
Miao Wang [Fri, 16 Jan 2015 16:33:52 +0000 (16:33 +0000)]
Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
Yohann Roussel [Fri, 16 Jan 2015 08:48:24 +0000 (09:48 +0100)]
Add clean targets removing jack and dex files
Those should help switching a tree from compiling with Jack back to
legacy toolchain.
Change-Id: I897a9a9923ed8147723b3ab6ad3f276e6b7094bf
Alexander Levitskiy [Fri, 16 Jan 2015 02:01:58 +0000 (02:01 +0000)]
Merge "Add fpc to vendor list"
Dirk Dougherty [Fri, 16 Jan 2015 00:58:59 +0000 (00:58 +0000)]
am
529a107f: Add new subtab under Distribute tab.
* commit '
529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
Ying Wang [Fri, 16 Jan 2015 00:37:02 +0000 (00:37 +0000)]
am
758a029e: am
59cbe2c6: Merge "Emit unique linker buildid in all binaries."
* commit '
758a029e2a7dbe6169fbccd8680e2856ae57ee8b':
Emit unique linker buildid in all binaries.
Ying Wang [Fri, 16 Jan 2015 00:28:48 +0000 (00:28 +0000)]
am
59cbe2c6: Merge "Emit unique linker buildid in all binaries."
* commit '
59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
Emit unique linker buildid in all binaries.
Dirk Dougherty [Mon, 15 Dec 2014 23:10:06 +0000 (15:10 -0800)]
Add new subtab under Distribute tab.
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
Ying Wang [Fri, 16 Jan 2015 00:17:15 +0000 (00:17 +0000)]
Merge "Emit unique linker buildid in all binaries."
Jeff Davidson [Fri, 16 Jan 2015 00:06:05 +0000 (00:06 +0000)]
am
0c949bd8: am
64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
* commit '
0c949bd86773c5d39df11cd824c9df372dc00342':
Update protobuf library from 2.3 to 2.6.
Dehao Chen [Wed, 14 Jan 2015 19:21:22 +0000 (11:21 -0800)]
Emit unique linker buildid in all binaries.
We want to store the symbol information for all android binaries in a global database.
* We ingest unstripped binaries into the global database
* When we collect address data from device (e.g. instruction pointer address), we want to lookup its symbol information through the global database. The key of the mapping is a unique build id, which is the same between binaries on device (stripped) and unstripped binaries.
After applying this patch, the system.img size increases by 0.0047% (16.3KB).
Change-Id: Id92faf2951f43a30947e8d2b690c1af6bf7e3f54
Jeff Davidson [Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)]
am
64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
* commit '
64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
Update protobuf library from 2.3 to 2.6.
Jeff Davidson [Thu, 15 Jan 2015 22:49:00 +0000 (22:49 +0000)]
Merge "Update protobuf library from 2.3 to 2.6."
Stephen Hines [Thu, 15 Jan 2015 19:06:31 +0000 (19:06 +0000)]
am
d57b7c64: am
5f31338c: Merge "Add ld.mc as a required executable to core_minimal.mk."
* commit '
d57b7c640dbc25fa1265543ca680a222003cf324':
Add ld.mc as a required executable to core_minimal.mk.
Stephen Hines [Thu, 15 Jan 2015 18:08:15 +0000 (18:08 +0000)]
am
5f31338c: Merge "Add ld.mc as a required executable to core_minimal.mk."
* commit '
5f31338c1bbc0a958d390d7b21ecf5fc66d29ffd':
Add ld.mc as a required executable to core_minimal.mk.
Yohann Roussel [Thu, 15 Jan 2015 17:58:35 +0000 (17:58 +0000)]
Merge "Use Jack to check build"
Yohann Roussel [Thu, 15 Jan 2015 17:56:22 +0000 (17:56 +0000)]
Merge "Don't exlude META-INF resources when building with Jack"
Stephen Hines [Thu, 15 Jan 2015 17:54:54 +0000 (17:54 +0000)]
Merge "Add ld.mc as a required executable to core_minimal.mk."
Yohann Roussel [Wed, 14 Jan 2015 15:21:39 +0000 (16:21 +0100)]
Don't exlude META-INF resources when building with Jack
java-to-jack is not manipulating jar files, just zip files so there
are no META-INF files generated by jar in them and no reason to filter
them out. And mainly, there are valid META-INF resources in the tree
we must keep.
Bug:
8287658
Bug:
18901198
Change-Id: Ice0fafca686b8fa3bafd886076946fbb1f952fb6
Yohann Roussel [Tue, 13 Jan 2015 16:07:04 +0000 (17:07 +0100)]
Use Jack to check build
Of modules that are to be compiled with Jack.
Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
Yohann Roussel [Thu, 15 Jan 2015 09:09:45 +0000 (09:09 +0000)]
Merge "Remove some useless depencies"
Andres Morales [Thu, 15 Jan 2015 02:27:41 +0000 (02:27 +0000)]
am
121e53ca: am
e1f21520: Merge "Add build.prop to root ramdisk"
* commit '
121e53cace8f2cea7b847c5efacfba06325e59f0':
Add build.prop to root ramdisk
Stephen Hines [Thu, 15 Jan 2015 00:11:12 +0000 (16:11 -0800)]
Add ld.mc as a required executable to core_minimal.mk.
Bug:
18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
Andres Morales [Wed, 14 Jan 2015 16:09:01 +0000 (16:09 +0000)]
am
e1f21520: Merge "Add build.prop to root ramdisk"
* commit '
e1f2152015069b595f9f62f8b74e26baa5ebad9d':
Add build.prop to root ramdisk
Andres Morales [Wed, 14 Jan 2015 15:56:19 +0000 (15:56 +0000)]
Merge "Add build.prop to root ramdisk"
Andres Morales [Tue, 13 Jan 2015 23:30:34 +0000 (15:30 -0800)]
Add build.prop to root ramdisk
will be used for verifying installed bootimage
Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
Elliott Hughes [Tue, 13 Jan 2015 20:33:04 +0000 (20:33 +0000)]
am
32ecc299: am
c56a6045: Merge "Remove HAVE_SYMLINKS."
* commit '
32ecc29996d8061ebf5ba2a039368575488132ff':
Remove HAVE_SYMLINKS.
Elliott Hughes [Tue, 13 Jan 2015 20:32:32 +0000 (20:32 +0000)]
am
aa07929b: am
1e61f12f: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
* commit '
aa07929b29f204ad5e96a8a75a63728cdd1e879a':
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
Elliott Hughes [Tue, 13 Jan 2015 20:30:58 +0000 (20:30 +0000)]
am
446b9418: am
780c4320: Merge "Remove HAVE_POSIX_CLOCKS."
* commit '
446b9418a4d0b9aa34bf66c99d08c00898b8df4e':
Remove HAVE_POSIX_CLOCKS.
Christopher Ferris [Tue, 13 Jan 2015 20:30:44 +0000 (20:30 +0000)]
am
b773a8d5: am
edbd5fd7: Merge "Fix whole static lib handling of duplicate names."
* commit '
b773a8d517189a06c54d8ed789806ed42aa42be0':
Fix whole static lib handling of duplicate names.
Yohann Roussel [Mon, 15 Dec 2014 15:25:14 +0000 (16:25 +0100)]
Remove some useless depencies
... from dexes to jars. This should allow to build less jars when
building dex files with Jack and Jill.
Change-Id: Ib3a717251e3bec3cc73564c205eb908ba1ef380f
Elliott Hughes [Tue, 13 Jan 2015 03:25:04 +0000 (03:25 +0000)]
am
c56a6045: Merge "Remove HAVE_SYMLINKS."
* commit '
c56a60451188da6385ae9f52e0adbef14c647f21':
Remove HAVE_SYMLINKS.
Elliott Hughes [Tue, 13 Jan 2015 03:11:34 +0000 (03:11 +0000)]
Merge "Remove HAVE_SYMLINKS."
Elliott Hughes [Tue, 13 Jan 2015 00:20:24 +0000 (16:20 -0800)]
Remove HAVE_SYMLINKS.
Change-Id: I685357292af45a048439f0df0ae45f513479841a
Miao Wang [Tue, 13 Jan 2015 01:20:28 +0000 (17:20 -0800)]
Make bcc-compat able to pick the right mtriple flag for Renderscript
Compat Lib.
Change-Id: Ifb3093ebc392d107e874cee3a67b5f6e942c6e0a
Elliott Hughes [Tue, 13 Jan 2015 00:31:22 +0000 (00:31 +0000)]
am
1e61f12f: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
* commit '
1e61f12f1ecf42c91f71bcc7610a25d83ca738d9':
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
Elliott Hughes [Tue, 13 Jan 2015 00:19:59 +0000 (00:19 +0000)]
Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
Elliott Hughes [Mon, 12 Jan 2015 21:48:27 +0000 (13:48 -0800)]
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
In particular, no one has had the system property server since we
killed the sim-eng build...
Change-Id: If576ec546b0ba2ad3c5299876027ca9ac189cf4a
Elliott Hughes [Mon, 12 Jan 2015 19:00:55 +0000 (19:00 +0000)]
am
780c4320: Merge "Remove HAVE_POSIX_CLOCKS."
* commit '
780c43208c9bdd1cacb18bf191b49d37a06cc19a':
Remove HAVE_POSIX_CLOCKS.
Elliott Hughes [Mon, 12 Jan 2015 18:53:01 +0000 (18:53 +0000)]
Merge "Remove HAVE_POSIX_CLOCKS."
Christopher Ferris [Mon, 12 Jan 2015 18:48:22 +0000 (18:48 +0000)]
am
edbd5fd7: Merge "Fix whole static lib handling of duplicate names."
* commit '
edbd5fd7e6e7dd54417dee96e230f774903d052b':
Fix whole static lib handling of duplicate names.
Christopher Ferris [Mon, 12 Jan 2015 18:41:18 +0000 (18:41 +0000)]
Merge "Fix whole static lib handling of duplicate names."
Baligh Uddin [Mon, 12 Jan 2015 04:19:09 +0000 (04:19 +0000)]
Baligh Uddin [Mon, 12 Jan 2015 04:15:19 +0000 (04:15 +0000)]
Baligh Uddin [Mon, 12 Jan 2015 04:07:49 +0000 (04:07 +0000)]
Baligh Uddin [Sun, 11 Jan 2015 21:41:08 +0000 (13:41 -0800)]
Fix default locale issue
(cherry picked from commit
2a52f5c52693dd15c3ac154670081f70dfae4ba9)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
Baligh Uddin [Sun, 11 Jan 2015 21:41:08 +0000 (13:41 -0800)]
Fix default locale issue
Elliott Hughes [Sat, 10 Jan 2015 00:27:41 +0000 (16:27 -0800)]
Remove HAVE_POSIX_CLOCKS.
Change-Id: Ide6f54f70bc5edda9ec1f1f05ebaa0acf58aaa77
Elliott Hughes [Fri, 9 Jan 2015 23:45:29 +0000 (23:45 +0000)]
am
b4fc5867: am
5368c02a: Merge "Remove HAVE_PRCTL."
* commit '
b4fc586794bfc69b02a0ebae5c75f8369cb95556':
Remove HAVE_PRCTL.
Elliott Hughes [Fri, 9 Jan 2015 23:38:53 +0000 (23:38 +0000)]
am
5368c02a: Merge "Remove HAVE_PRCTL."
* commit '
5368c02ac68dc263284bf0cfb1869f0de3f5f5fa':
Remove HAVE_PRCTL.
Elliott Hughes [Fri, 9 Jan 2015 23:30:19 +0000 (23:30 +0000)]
Merge "Remove HAVE_PRCTL."
Elliott Hughes [Fri, 9 Jan 2015 23:24:31 +0000 (15:24 -0800)]
Remove HAVE_PRCTL.
Change-Id: Ic58f8e4c0f749bbc19e5d14de8d99321e7cf833c
Elliott Hughes [Fri, 9 Jan 2015 22:54:13 +0000 (22:54 +0000)]
am
37019a1d: am
d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."
* commit '
37019a1de6ace9eec11edb28e29c8f42ee7bd379':
Remove HAVE_SYS_SOCKET_H.
Elliott Hughes [Fri, 9 Jan 2015 22:48:16 +0000 (22:48 +0000)]
am
d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."
* commit '
d9de8e0d9acd17a2406d25bb970c615067d2ba34':
Remove HAVE_SYS_SOCKET_H.
Elliott Hughes [Fri, 9 Jan 2015 22:40:36 +0000 (22:40 +0000)]
Merge "Remove HAVE_SYS_SOCKET_H."
Elliott Hughes [Fri, 9 Jan 2015 20:22:24 +0000 (12:22 -0800)]
Remove HAVE_SYS_SOCKET_H.
Change-Id: I9ee38c603e3933b012da818b386cb374eec9fe21
Brian Carlstrom [Fri, 9 Jan 2015 19:43:41 +0000 (19:43 +0000)]
am
ad156cdd: am
a0b98c73: Merge "[MIPS64] Set ART base address for mips64"
* commit '
ad156cdd8d2ea2d98281b6d43a98073a5b86f5ab':
[MIPS64] Set ART base address for mips64
Brian Carlstrom [Fri, 9 Jan 2015 19:36:39 +0000 (19:36 +0000)]
am
a0b98c73: Merge "[MIPS64] Set ART base address for mips64"
* commit '
a0b98c738012d5bc37356bd0b16ad9c965ec56dd':
[MIPS64] Set ART base address for mips64
Brian Carlstrom [Fri, 9 Jan 2015 19:23:39 +0000 (19:23 +0000)]
Merge "[MIPS64] Set ART base address for mips64"
Brian Carlstrom [Fri, 9 Jan 2015 18:08:00 +0000 (18:08 +0000)]
am
d169346b: am
7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
* commit '
d169346b055eaac6897c3edac9a77042fceb11b2':
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
Brian Carlstrom [Fri, 9 Jan 2015 18:02:20 +0000 (18:02 +0000)]
am
7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
* commit '
7a1125bc632e150b934538036102807374406d2f':
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
Miao Wang [Fri, 9 Jan 2015 17:52:49 +0000 (17:52 +0000)]
am
de00ebbe: am
caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
* commit '
de00ebbe24185237a1056fde39cfc839534e31da':
Add build rules for 64bit Renderscript Compat lib.
Brian Carlstrom [Fri, 9 Jan 2015 17:51:57 +0000 (17:51 +0000)]
Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
Miao Wang [Fri, 9 Jan 2015 17:48:22 +0000 (17:48 +0000)]
am
caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
* commit '
caf44db2d1d829a001d5b0ac8371d33928b3d575':
Add build rules for 64bit Renderscript Compat lib.
Miao Wang [Thu, 20 Nov 2014 19:05:18 +0000 (11:05 -0800)]
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
bug
12924018
Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
Miao Wang [Fri, 9 Jan 2015 17:38:47 +0000 (17:38 +0000)]
Merge "Add build rules for 64bit Renderscript Compat lib."
Jeff Davidson [Fri, 9 Jan 2015 02:55:32 +0000 (02:55 +0000)]
am
ee65f03b: am
dd198b77: Merge "Move installed module dependency setup after proto handling."
* commit '
ee65f03b3c35e481d1bd1a6f4e8374953d20fe98':
Move installed module dependency setup after proto handling.
Jeff Davidson [Fri, 9 Jan 2015 02:51:41 +0000 (02:51 +0000)]
am
dd198b77: Merge "Move installed module dependency setup after proto handling."
* commit '
dd198b77a1bae9974b741cc7d1dad328dce3c3b6':
Move installed module dependency setup after proto handling.
Jeff Davidson [Fri, 9 Jan 2015 02:37:16 +0000 (02:37 +0000)]
Merge "Move installed module dependency setup after proto handling."
Jeff Davidson [Fri, 9 Jan 2015 02:25:30 +0000 (18:25 -0800)]
Move installed module dependency setup after proto handling.
The proto handling will modify the set of dependent libraries, but
this was not actually accounted for in dependency handling because
dependencies had already been established.
Change-Id: Iba1582f3c9eeeada19569e4b5358b6ec4168fccc
Miao Wang [Thu, 8 Jan 2015 02:18:41 +0000 (18:18 -0800)]
Add build rules for 64bit Renderscript Compat lib.
Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
Jeff Davidson [Fri, 9 Jan 2015 00:33:43 +0000 (16:33 -0800)]
Update protobuf library from 2.3 to 2.6.
Change-Id: I02d308b01f635307dbb63ea9610db2e56eb1f31b
Douglas Leung [Thu, 8 Jan 2015 00:29:39 +0000 (16:29 -0800)]
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
This is used to set --instruction-set-variant for dex2oat.
Change-Id: Ic93d1bfab634489e004ccf1195cdcfc767f092ef
Christopher Ferris [Thu, 8 Jan 2015 01:14:03 +0000 (17:14 -0800)]
Fix whole static lib handling of duplicate names.
If LOCAL_WHOLE_STATIC_LIBRARIES contains a library that has
two files that have the same name but are in different
directories, only the first gets included.
This fix detects this case, and uses the m option to ar to force the
duplicate object to the end of the archive. After this, using the p
option gets the correct object file.
Change-Id: I2e183f48cef3c79499d4ab8ff147444611ff938b
Jesse Zhao [Wed, 7 Jan 2015 21:20:15 +0000 (21:20 +0000)]
Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
David Turner [Wed, 7 Jan 2015 20:41:57 +0000 (20:41 +0000)]
am
7a864af1: am
aa112716: Merge "build_image: Set file system labels on disk images"
* commit '
7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
build_image: Set file system labels on disk images
David Turner [Wed, 7 Jan 2015 20:28:17 +0000 (20:28 +0000)]
am
aa112716: Merge "build_image: Set file system labels on disk images"
* commit '
aa112716067167d58d1db37aaf8adc49b83b59a1':
build_image: Set file system labels on disk images
David Turner [Wed, 7 Jan 2015 20:19:04 +0000 (20:19 +0000)]
Merge "build_image: Set file system labels on disk images"
Elliott Hughes [Wed, 7 Jan 2015 04:53:45 +0000 (04:53 +0000)]
am
7d9073cf: am
405931e9: Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
* commit '
7d9073cf34d7ddfc32b1eb6ca1c2292b46be0dd7':
Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
Elliott Hughes [Wed, 7 Jan 2015 04:46:22 +0000 (04:46 +0000)]
am
405931e9: Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
* commit '
405931e961b66b5862a14d75792736ca622f5f34':
Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
Elliott Hughes [Wed, 7 Jan 2015 04:34:52 +0000 (04:34 +0000)]
Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
Elliott Hughes [Wed, 7 Jan 2015 03:14:37 +0000 (19:14 -0800)]
Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
The only code that still references this is only built for arm, so this
should be a no-op.
Change-Id: I64f40fc68bb387b6309075d158f5bd12f398ef20
Ying Wang [Wed, 7 Jan 2015 02:20:13 +0000 (02:20 +0000)]
am
4cdebd4c: am
21a1f842: am
961096fa: Remove ancient SDK cleanbuild rule
* commit '
4cdebd4c7b71d965c5d5dab9b2194b9624357367':
Remove ancient SDK cleanbuild rule
OSDN Git Service
