OSDN Git Service
Ying Wang [Mon, 26 Jan 2015 19:12:18 +0000 (19:12 +0000)]
am
1b140e16: Merge "Build hostdex on only Linux."
* commit '
1b140e16e1d8dd022331242fcd5a3a1e8548fa4b':
Build hostdex on only Linux.
Fix comma in $(if ...).
Ying Wang [Mon, 26 Jan 2015 18:43:17 +0000 (18:43 +0000)]
Merge "Build hostdex on only Linux."
Ying Wang [Mon, 26 Jan 2015 17:52:28 +0000 (09:52 -0800)]
Build hostdex on only Linux.
Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a
Dan Albert [Sun, 25 Jan 2015 22:30:19 +0000 (22:30 +0000)]
Merge "Fix comma in $(if ...)."
Logan Chien [Sun, 25 Jan 2015 13:15:12 +0000 (21:15 +0800)]
Fix comma in $(if ...).
Change-Id: I2f9fba5b5c0384ef12ee9e5f48fa01102436a425
Dan Albert [Sat, 24 Jan 2015 23:42:11 +0000 (23:42 +0000)]
am
172cd765: Merge "Allow coverage with clang."
* commit '
172cd7653e4dfb628065349ea915329076e44e1d':
Allow coverage with clang.
Dan Albert [Sat, 24 Jan 2015 23:42:09 +0000 (23:42 +0000)]
am
9ba25d6b: Merge "Enable host coverage."
* commit '
9ba25d6bfd983655dc9c0584887db2b6cb3be999':
Enable host coverage.
Dan Albert [Sat, 24 Jan 2015 23:32:19 +0000 (23:32 +0000)]
Merge "Allow coverage with clang."
Dan Albert [Sat, 24 Jan 2015 23:32:15 +0000 (23:32 +0000)]
Merge "Enable host coverage."
Dan Albert [Sat, 24 Jan 2015 23:14:35 +0000 (15:14 -0800)]
Allow coverage with clang.
Note that this doesn't play nicely with acov out of the box. Clang
apparently generates .gcno files that aren't compatible with gcov-4.8.
This can be solved by installing gcc-4.6 and invoking lcov with
`--gcov-tool /usr/bin/gcov-4.6`.
http://stackoverflow.com/questions/
17758126/clang-code-coverage-invalid-output
Change-Id: I79547e1c579fa79db47ff07d5e90c42cedbd5cbb
Dan Albert [Sat, 24 Jan 2015 00:12:57 +0000 (16:12 -0800)]
Enable host coverage.
Don't remember why I didn't enable this for the host when I made the
first pass, but it works just fine.
Change-Id: I0892c0bc353bf8b60b432ba9f69f97281177d41d
Chih-Hung Hsieh [Sat, 24 Jan 2015 01:16:28 +0000 (01:16 +0000)]
am
840bc269: Merge "Add -static to static link command, for clang."
* commit '
840bc269ee79363cd463d4e69cc5e590d80df1b6':
Add -static to static link command, for clang.
Chih-Hung Hsieh [Sat, 24 Jan 2015 01:03:02 +0000 (01:03 +0000)]
Merge "Add -static to static link command, for clang."
Chih-Hung Hsieh [Tue, 20 Jan 2015 19:00:20 +0000 (11:00 -0800)]
Add -static to static link command, for clang.
Clang driver needs -static flag, not -Bstatic,
to produce statically linked modules.
However, -static is not added if LDFLAGS contains -shared,
which is used in bionic/linker to create a shared object with static libraries.
BUG:
18008984
Change-Id: I75c3e24973ee77170285ec4c8e7aacc345722685
Ying Wang [Fri, 23 Jan 2015 00:50:39 +0000 (00:50 +0000)]
am
6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE"
* commit '
6aa932cabf6ed14c35ae49b78464e2504af87c58':
Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
Dmitriy Ivanov [Fri, 23 Jan 2015 00:50:38 +0000 (00:50 +0000)]
am
23396bfc: Merge "gdbclient: Improve error handling"
* commit '
23396bfc8d613f9319bce836a49ae6ee7ad18c0b':
gdbclient: Improve error handling
Ying Wang [Fri, 23 Jan 2015 00:14:26 +0000 (00:14 +0000)]
Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE"
Dmitriy Ivanov [Fri, 23 Jan 2015 00:02:42 +0000 (00:02 +0000)]
Merge "gdbclient: Improve error handling"
Ying Wang [Thu, 22 Jan 2015 23:44:04 +0000 (15:44 -0800)]
Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
So the build system regenerates import_includes when you modify
Android.mk to add a new dependency library.
Change-Id: Ic92b097b659bb68a9065e1d66da59e0dc7e2836a
Dmitriy Ivanov [Thu, 22 Jan 2015 21:22:17 +0000 (13:22 -0800)]
gdbclient: Improve error handling
Print error message when unable to resolve exefile by pid
Change-Id: I5d04bdc348e5f95818ac90e29148947edfce42eb
Ying Wang [Thu, 22 Jan 2015 20:47:14 +0000 (20:47 +0000)]
am
f495c125: am
507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit '
f495c12557a0f152046122fc162d2fcfbf305a99':
Let apicheck check both the public API and system API.
Ying Wang [Thu, 22 Jan 2015 20:41:09 +0000 (20:41 +0000)]
am
507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit '
507ea383aaaea5634c79d20911773aa44324e7f5':
Let apicheck check both the public API and system API.
Ying Wang [Thu, 22 Jan 2015 20:36:52 +0000 (20:36 +0000)]
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
Narayan Kamath [Thu, 22 Jan 2015 18:53:59 +0000 (18:53 +0000)]
resolved conflicts for merge of
8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
Narayan Kamath [Thu, 22 Jan 2015 14:04:52 +0000 (14:04 +0000)]
Merge "Add ro.product.locale"
Ying Wang [Thu, 22 Jan 2015 00:13:35 +0000 (00:13 +0000)]
am
8768c6b7: Merge "Remove phone from frameworks/base subdirs"
* commit '
8768c6b70b4b2957a5dda132650e8d6dec7c485e':
Remove phone from frameworks/base subdirs
Ying Wang [Thu, 22 Jan 2015 00:13:34 +0000 (00:13 +0000)]
am
ae542c78: Merge "Revert "Add the default local_time hal implementation to builds.""
* commit '
ae542c785d11f1e62f20f4493e422fdf5749d397':
Revert "Add the default local_time hal implementation to builds."
Ying Wang [Thu, 22 Jan 2015 00:13:33 +0000 (00:13 +0000)]
am
29a29875: Merge "Running jarjar on Java resources."
* commit '
29a29875627758aa3c76aa5256641c1782c904bf':
Running jarjar on Java resources.
David Turner [Thu, 22 Jan 2015 00:13:32 +0000 (00:13 +0000)]
am
8be358bf: Merge "emulator: Include the ranchu sensors library"
* commit '
8be358bf9a5407a379d4c4709c172b8c1ba6d4c7':
emulator: Include the ranchu sensors library
Christopher Ferris [Thu, 22 Jan 2015 00:13:30 +0000 (00:13 +0000)]
am
9f9ccbfd: Merge "Fix missing parenthesis."
* commit '
9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
Fix missing parenthesis.
Ying Wang [Wed, 21 Jan 2015 20:06:58 +0000 (20:06 +0000)]
Merge "Remove phone from frameworks/base subdirs"
Ying Wang [Wed, 21 Jan 2015 20:05:22 +0000 (20:05 +0000)]
Merge "Revert "Add the default local_time hal implementation to builds.""
Ying Wang [Wed, 21 Jan 2015 20:04:20 +0000 (20:04 +0000)]
Merge "Running jarjar on Java resources."
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.
(cherry-picked from commit
140274707e31c9585aa28b0de2f1418c64ecd272)
Bug:
18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
David Turner [Wed, 21 Jan 2015 19:42:53 +0000 (19:42 +0000)]
Merge "emulator: Include the ranchu sensors library"
Christopher Ferris [Wed, 21 Jan 2015 18:39:06 +0000 (18:39 +0000)]
Merge "Fix missing parenthesis."
Chih-Wei Huang [Wed, 21 Jan 2015 04:09:27 +0000 (12:09 +0800)]
Revert "Add the default local_time hal implementation to builds."
Remove duplicate local_time.default.
This reverts commit
a09c24db71ec4babd0e4db36ffdd180b2fcc6f7a.
Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99
Chih-Wei Huang [Wed, 5 Nov 2014 09:30:58 +0000 (17:30 +0800)]
Remove phone from frameworks/base subdirs
The directory no longer exists.
Change-Id: Id8d109818f06783d72dfc005595330f735b7e5cf
Christopher Ferris [Wed, 21 Jan 2015 02:23:05 +0000 (18:23 -0800)]
Fix missing parenthesis.
Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
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: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)"
Narayan Kamath [Thu, 15 Jan 2015 18:16:24 +0000 (18:16 +0000)]
Add ro.product.locale
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.
bug:
17691569
Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
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: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."
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 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.
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."
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 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: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
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: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: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."
Ying Wang [Fri, 9 Jan 2015 22:05:38 +0000 (14:05 -0800)]
Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.
Bug:
18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
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: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: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.
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: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
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