Dmitriy Ivanov
5586efa028
am 23396bfc: Merge "gdbclient: Improve error handling"
...
* commit '23396bfc8d613f9319bce836a49ae6ee7ad18c0b':
gdbclient: Improve error handling
2015-01-23 00:50:38 +00:00
Dmitriy Ivanov
23396bfc8d
Merge "gdbclient: Improve error handling"
2015-01-23 00:02:42 +00:00
Dmitriy Ivanov
dfff170148
gdbclient: Improve error handling
...
Print error message when unable to resolve exefile by pid
Change-Id: I5d04bdc348e5f95818ac90e29148947edfce42eb
2015-01-22 13:43:09 -08:00
Ying Wang
febc6b567a
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.
2015-01-22 20:47:14 +00:00
Ying Wang
f495c12557
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.
2015-01-22 20:41:09 +00:00
Ying Wang
507ea383aa
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
2015-01-22 20:36:53 +00:00
Narayan Kamath
675a726fe4
resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Narayan Kamath
8f5fc9e246
Merge "Add ro.product.locale"
2015-01-22 14:04:53 +00:00
Ying Wang
30a0031e43
am 8768c6b7: Merge "Remove phone from frameworks/base subdirs"
...
* commit '8768c6b70b4b2957a5dda132650e8d6dec7c485e':
Remove phone from frameworks/base subdirs
2015-01-22 00:13:35 +00:00
Ying Wang
79834f371e
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."
2015-01-22 00:13:34 +00:00
Ying Wang
0f205ad959
am 29a29875: Merge "Running jarjar on Java resources."
...
* commit '29a29875627758aa3c76aa5256641c1782c904bf':
Running jarjar on Java resources.
2015-01-22 00:13:33 +00:00
David Turner
b6af64c3ea
am 8be358bf: Merge "emulator: Include the ranchu sensors library"
...
* commit '8be358bf9a5407a379d4c4709c172b8c1ba6d4c7':
emulator: Include the ranchu sensors library
2015-01-22 00:13:32 +00:00
Christopher Ferris
8b62f12195
am 9f9ccbfd: Merge "Fix missing parenthesis."
...
* commit '9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
Fix missing parenthesis.
2015-01-22 00:13:30 +00:00
Ying Wang
8768c6b70b
Merge "Remove phone from frameworks/base subdirs"
2015-01-21 20:06:59 +00:00
Ying Wang
ae542c785d
Merge "Revert "Add the default local_time hal implementation to builds.""
2015-01-21 20:05:22 +00:00
Ying Wang
29a2987562
Merge "Running jarjar on Java resources."
2015-01-21 20:04:20 +00:00
Ying Wang
07acdbfd32
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 140274707e
)
Bug: 18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
2015-01-21 11:57:52 -08:00
David Turner
8be358bf9a
Merge "emulator: Include the ranchu sensors library"
2015-01-21 19:42:54 +00:00
Christopher Ferris
9f9ccbfd6a
Merge "Fix missing parenthesis."
2015-01-21 18:39:06 +00:00
Chih-Wei Huang
567ea28838
Revert "Add the default local_time hal implementation to builds."
...
Remove duplicate local_time.default.
This reverts commit a09c24db71
.
Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99
2015-01-21 12:17:58 +08:00
Chih-Wei Huang
65ced619b1
Remove phone from frameworks/base subdirs
...
The directory no longer exists.
Change-Id: Id8d109818f06783d72dfc005595330f735b7e5cf
2015-01-21 12:07:28 +08:00
Christopher Ferris
a8f5b8d0e2
Fix missing parenthesis.
...
Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
2015-01-20 18:23:05 -08:00
Ying Wang
c0ff83aebd
am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
...
* commit '17967eb72f0eb7f495800d5065b64db4a0174362':
[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
2015-01-16 18:32:18 +00:00
Dirk Dougherty
4433ac859c
am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit 'd12838890563b2fb4532630373760a995970f687':
Add new subtab under Distribute tab.
2015-01-16 18:17:59 +00:00
Ying Wang
17967eb72f
Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
2015-01-16 18:13:36 +00:00
Duane Sand
1a07487493
[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
...
Change-Id: Ice2d0f65eced4fb7dd209fb15610ba555dd45f2c
2015-01-16 18:13:17 +00:00
Dirk Dougherty
d128388905
am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit '48141e05994ce939b2becab40d86482bda3d9090':
Add new subtab under Distribute tab.
2015-01-16 18:11:03 +00:00
Dirk Dougherty
48141e0599
am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
...
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Miao Wang
eb66dc39a9
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.
2015-01-16 16:44:17 +00:00
Miao Wang
50ef904068
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)
2015-01-16 16:44:15 +00:00
Miao Wang
62d49dc5db
Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
2015-01-16 16:34:16 +00:00
Miao Wang
2b942f87f6
Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
2015-01-16 16:33:53 +00:00
Narayan Kamath
baf3eb93ee
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
2015-01-16 10:16:52 +00:00
Dirk Dougherty
5a97f24411
am 529a107f: Add new subtab under Distribute tab.
...
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Ying Wang
758a029e2a
am 59cbe2c6: Merge "Emit unique linker buildid in all binaries."
...
* commit '59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
Emit unique linker buildid in all binaries.
2015-01-16 00:28:48 +00:00
Dirk Dougherty
529a107f9d
Add new subtab under Distribute tab.
...
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Ying Wang
59cbe2c65c
Merge "Emit unique linker buildid in all binaries."
2015-01-16 00:17:19 +00:00
Dehao Chen
734de7a8b4
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
2015-01-15 23:09:35 +00:00
Jeff Davidson
0c949bd867
am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
...
* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
Update protobuf library from 2.3 to 2.6.
2015-01-15 23:01:59 +00:00
Jeff Davidson
64606bd5b0
Merge "Update protobuf library from 2.3 to 2.6."
2015-01-15 22:49:00 +00:00
Stephen Hines
d57b7c640d
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.
2015-01-15 18:08:15 +00:00
Stephen Hines
5f31338c1b
Merge "Add ld.mc as a required executable to core_minimal.mk."
2015-01-15 17:54:55 +00:00
Stephen Hines
2306635fa3
Add ld.mc as a required executable to core_minimal.mk.
...
Bug: 18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
2015-01-14 16:11:12 -08:00
Andres Morales
121e53cace
am e1f21520: Merge "Add build.prop to root ramdisk"
...
* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
Add build.prop to root ramdisk
2015-01-14 16:09:01 +00:00
Andres Morales
e1f2152015
Merge "Add build.prop to root ramdisk"
2015-01-14 15:56:20 +00:00
Andres Morales
9c820f82c4
Add build.prop to root ramdisk
...
will be used for verifying installed bootimage
Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
2015-01-13 17:55:09 -08:00
Elliott Hughes
32ecc29996
am c56a6045: Merge "Remove HAVE_SYMLINKS."
...
* commit 'c56a60451188da6385ae9f52e0adbef14c647f21':
Remove HAVE_SYMLINKS.
2015-01-13 03:25:04 +00:00
Elliott Hughes
c56a604511
Merge "Remove HAVE_SYMLINKS."
2015-01-13 03:11:35 +00:00
Elliott Hughes
5877c21436
Remove HAVE_SYMLINKS.
...
Change-Id: I685357292af45a048439f0df0ae45f513479841a
2015-01-12 17:21:01 -08:00
Miao Wang
9b2908b4f6
Make bcc-compat able to pick the right mtriple flag for Renderscript
...
Compat Lib.
Change-Id: Ifb3093ebc392d107e874cee3a67b5f6e942c6e0a
2015-01-12 17:20:28 -08:00