OSDN Git Service
dcashman [Wed, 22 Apr 2015 21:49:23 +0000 (14:49 -0700)]
resolved conflicts for merge of
b9e4848e to master
Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
dcashman [Wed, 22 Apr 2015 19:07:25 +0000 (19:07 +0000)]
am
0ae8bf67: am
780bdd6a: am
ab59266d: Merge "Add lib dirs to cts distribution."
* commit '
0ae8bf67af3d24f0391c21230d606c12128d2d6f':
Add lib dirs to cts distribution.
dcashman [Wed, 22 Apr 2015 18:55:13 +0000 (18:55 +0000)]
am
780bdd6a: am
ab59266d: Merge "Add lib dirs to cts distribution."
* commit '
780bdd6a1363cfe2fb9425647e0458dd2aee43f4':
Add lib dirs to cts distribution.
Ryosuke Matsuuchi [Wed, 22 Apr 2015 17:31:49 +0000 (17:31 +0000)]
am
7ff8d816: am
40af4381: doc: Add Korean version of DAC/distribute/ page.
* commit '
7ff8d816d8c8a5aa1d661c9ee3cb822f75cfde89':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Wed, 22 Apr 2015 17:17:41 +0000 (17:17 +0000)]
am
40af4381: doc: Add Korean version of DAC/distribute/ page.
* commit '
40af438100fd88a1a7e3de955aaaad16baf178db':
doc: Add Korean version of DAC/distribute/ page.
dcashman [Wed, 22 Apr 2015 17:10:51 +0000 (17:10 +0000)]
am
ab59266d: Merge "Add lib dirs to cts distribution."
* commit '
ab59266db0d3d16ca58e06ad327a9909e45c1516':
Add lib dirs to cts distribution.
dcashman [Wed, 22 Apr 2015 17:02:31 +0000 (17:02 +0000)]
Merge "Add lib dirs to cts distribution."
dcashman [Tue, 21 Apr 2015 18:25:28 +0000 (11:25 -0700)]
Add lib dirs to cts distribution.
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.
Bug:
19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
Dmitriy Ivanov [Mon, 20 Apr 2015 21:08:43 +0000 (14:08 -0700)]
resolved conflicts for merge of
6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
Dmitriy Ivanov [Mon, 20 Apr 2015 20:43:18 +0000 (20:43 +0000)]
am
baca453a: am
5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
* commit '
baca453a7d23fb2cf8a38d8aad3addbfce362afc':
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Dmitriy Ivanov [Mon, 20 Apr 2015 20:30:43 +0000 (20:30 +0000)]
am
5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
* commit '
5beb338793b9047b156aeb841a3417d9709b116f':
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Dmitriy Ivanov [Mon, 20 Apr 2015 20:18:55 +0000 (20:18 +0000)]
Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
Dmitriy Ivanov [Mon, 20 Apr 2015 19:06:37 +0000 (12:06 -0700)]
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
Ryosuke Matsuuchi [Fri, 17 Apr 2015 01:30:30 +0000 (10:30 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
(cherry picked from commit
25799ca584867aca5f0037309ac5618c7dbef70b)
Nick Kralevich [Sun, 19 Apr 2015 06:47:02 +0000 (06:47 +0000)]
Merge "Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are used"
Ryosuke Matsuuchi [Sun, 19 Apr 2015 05:53:32 +0000 (05:53 +0000)]
am
bdc47592: am
959d12b1: am
f98bdce1: am
90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
bdc47592dbf4b6258b947677f38b0ef95b6ea241':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:55:07 +0000 (00:55 +0000)]
am
959d12b1: am
f98bdce1: am
90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
959d12b11eabfde1c7b4688eda44b90d0e641d2e':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:49:00 +0000 (00:49 +0000)]
am
f98bdce1: am
90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
f98bdce10b0b47551417a87df876b918bede64d9':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:38:45 +0000 (00:38 +0000)]
am
90ac39d2: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
90ac39d2b56171b92f8d136fb8e35a63f8b70ff1':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:16:03 +0000 (00:16 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:16:22 +0000 (23:16 +0000)]
am
267e70ed: am
e85f328a: am
e8ee9918: am
42321423: Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
* commit '
267e70ed6bc87148e91cbfaf8cc8a3ac248cbe4c':
Doc change: increment metadata for updated Distribute landing page content.
Dirk Dougherty [Sat, 18 Apr 2015 22:54:34 +0000 (22:54 +0000)]
am
e85f328a: am
e8ee9918: am
42321423: Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
* commit '
e85f328a67a25261a073be940302a1d731f5c909':
Doc change: increment metadata for updated Distribute landing page content.
Dirk Dougherty [Sat, 18 Apr 2015 22:44:30 +0000 (22:44 +0000)]
am
e8ee9918: am
42321423: Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
* commit '
e8ee99188d3b5a1698c639652a1e5a871df41aca':
Doc change: increment metadata for updated Distribute landing page content.
Dirk Dougherty [Sat, 18 Apr 2015 22:37:39 +0000 (22:37 +0000)]
am
42321423: Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
* commit '
4232142313a582939d80209a1449f3e4a08f6701':
Doc change: increment metadata for updated Distribute landing page content.
Dirk Dougherty [Sat, 18 Apr 2015 22:19:10 +0000 (22:19 +0000)]
Merge "Doc change: increment metadata for updated Distribute landing page content." into lmp-docs
Nick Kralevich [Sat, 18 Apr 2015 04:29:17 +0000 (21:29 -0700)]
Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are used
LOCAL_PREBUILT_JNI_LIBS is an indication to the build system that
all shared libraries should be deleted from an APK, and the shared
libraries should be placed in the application's /system/app directory.
However, using this option isn't appropriate for pre-signed APKs.
Any attempt to delete files from a pre-signed APK will corrupt it's
signature or waste disk space.
Bug:
20247329
Bug:
8076853
Bug:
1162500
Change-Id: I89ce8f06d3889dd79dd9ffe86fc5fa60814498ad
Nick Kralevich [Sat, 18 Apr 2015 01:33:09 +0000 (01:33 +0000)]
am
ebe3f7a5: am
700265ce: am
69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '
ebe3f7a59878d797f8f0de234f251958fee1c5af':
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
Nick Kralevich [Sat, 18 Apr 2015 01:00:47 +0000 (01:00 +0000)]
am
700265ce: am
69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '
700265cee29c442369bfa6ee3f90bd51b79177d9':
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
Nick Kralevich [Sat, 18 Apr 2015 00:48:37 +0000 (00:48 +0000)]
am
69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '
69b20474d578ea6313570c29526fc0854a920946':
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
Nick Kralevich [Sat, 18 Apr 2015 00:38:07 +0000 (00:38 +0000)]
Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
Justin Klaassen [Sat, 18 Apr 2015 00:24:23 +0000 (00:24 +0000)]
Merge "Switch from Calculator to ExactCalculator"
Nick Kralevich [Fri, 17 Apr 2015 23:53:15 +0000 (16:53 -0700)]
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.
Bug:
20247329
Bug:
8076853
Bug:
1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
Dan Albert [Fri, 17 Apr 2015 20:14:13 +0000 (20:14 +0000)]
am
07607526: am
63082eab: am
b6874440: Merge "Add support for a partial ubsan build."
* commit '
07607526b8701f471869aecbd89fe4ea1990251e':
Add support for a partial ubsan build.
Dan Albert [Fri, 17 Apr 2015 19:53:03 +0000 (19:53 +0000)]
am
63082eab: am
b6874440: Merge "Add support for a partial ubsan build."
* commit '
63082eab1f1e18b06882fbbaf08ee64c3f68193a':
Add support for a partial ubsan build.
Dmitriy Ivanov [Fri, 17 Apr 2015 19:42:55 +0000 (19:42 +0000)]
am
a6c44859: am
bc671bc6: am
e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
a6c44859c5344d489526641ce5a08598254da57b':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dan Albert [Fri, 17 Apr 2015 19:42:42 +0000 (19:42 +0000)]
am
b6874440: Merge "Add support for a partial ubsan build."
* commit '
b68744405129867b6f48e37fdf5f91102f2aba3f':
Add support for a partial ubsan build.
Dan Albert [Fri, 17 Apr 2015 19:33:01 +0000 (19:33 +0000)]
Merge "Add support for a partial ubsan build."
Sami Tolvanen [Fri, 17 Apr 2015 19:30:23 +0000 (19:30 +0000)]
am
c4d303e9: am
7788547f: am
586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit '
c4d303e958e1f3475fd1070bdb307b4f675f3bdd':
Calculate max_stashed_blocks correctly for block OTA v3
Dan Albert [Fri, 17 Apr 2015 19:30:22 +0000 (19:30 +0000)]
am
048b3eb0: am
7a1d29eb: am
1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '
048b3eb0170b8816cd97400a43f7f1523c19c210':
Fix misuse of my_sanitize_host.
Dan Albert [Fri, 17 Apr 2015 19:30:20 +0000 (19:30 +0000)]
am
757417f9: am
f1b7c073: am
6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '
757417f9438a3a83d9fa1f7b10d74436fd6f61e4':
Make use of sanitizers without clang an error.
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:25 +0000 (19:20 +0000)]
am
bc671bc6: am
e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
bc671bc65ee8db4ba0bba33543d41d372f424f9d':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Sami Tolvanen [Fri, 17 Apr 2015 19:09:02 +0000 (19:09 +0000)]
am
7788547f: am
586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit '
7788547ff34d93b5196933eedb9f006fb1fe9f4d':
Calculate max_stashed_blocks correctly for block OTA v3
Dmitriy Ivanov [Fri, 17 Apr 2015 19:09:01 +0000 (19:09 +0000)]
am
e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
e3aa1c1f85f981fabe9be0587e49538f4b6dd576':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dan Albert [Fri, 17 Apr 2015 19:09:00 +0000 (19:09 +0000)]
am
7a1d29eb: am
1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '
7a1d29eb4bea37a4f043330cf722f720103129b8':
Fix misuse of my_sanitize_host.
Dan Albert [Fri, 17 Apr 2015 19:08:59 +0000 (19:08 +0000)]
am
f1b7c073: am
6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '
f1b7c073a4d1b3f47811b6b9e85c6589d293c373':
Make use of sanitizers without clang an error.
Sami Tolvanen [Fri, 17 Apr 2015 18:52:57 +0000 (18:52 +0000)]
am
586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit '
586b38cc397758848dbfc09351cadd39b89b9e49':
Calculate max_stashed_blocks correctly for block OTA v3
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:13 +0000 (18:50 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dan Albert [Fri, 17 Apr 2015 18:48:53 +0000 (18:48 +0000)]
am
1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '
1d8f780c7d15441ad6582fc32447d9409c39f31a':
Fix misuse of my_sanitize_host.
Dan Albert [Fri, 17 Apr 2015 18:48:52 +0000 (18:48 +0000)]
am
6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '
6ed5bea46fac846f1a96a8245d8f529d691e3da7':
Make use of sanitizers without clang an error.
Sami Tolvanen [Fri, 17 Apr 2015 18:43:51 +0000 (18:43 +0000)]
Merge "Calculate max_stashed_blocks correctly for block OTA v3"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:00:15 +0000 (11:00 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.
Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
Dan Albert [Fri, 17 Apr 2015 01:07:07 +0000 (18:07 -0700)]
Add support for a partial ubsan build.
Some of the ubsan checks expose a few pathological performance cases
in clang, and thus aren't suited to be used in SANITIZE_HOST.
This mode is also supported on the target despite not having the
target runtime libraries for ubsan by generating traps.
Change-Id: I0b0f0a08ca84d72e44e2174a66726b1c5e5cad7e
Dan Albert [Fri, 17 Apr 2015 18:33:40 +0000 (18:33 +0000)]
Merge "Fix misuse of my_sanitize_host."
Dan Albert [Fri, 17 Apr 2015 18:33:23 +0000 (18:33 +0000)]
Merge "Make use of sanitizers without clang an error."
Dan Albert [Fri, 17 Apr 2015 18:04:06 +0000 (11:04 -0700)]
Fix misuse of my_sanitize_host.
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.
Change-Id: Id8a095821d000a184e72f950b9481597073a7044
Dan Albert [Fri, 17 Apr 2015 16:48:33 +0000 (09:48 -0700)]
Make use of sanitizers without clang an error.
Previously using a sanitizer would imply clang. It should be an error
instead so it's more obvious.
Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
Dan Albert [Fri, 17 Apr 2015 17:32:23 +0000 (17:32 +0000)]
am
fad70977: am
cf6e1ff6: am
27176208: Merge "Clean up sanitizer configuration."
* commit '
fad709772e766ce83b4667e89a25a7f0d90ca5f8':
Clean up sanitizer configuration.
Dan Albert [Fri, 17 Apr 2015 17:08:55 +0000 (17:08 +0000)]
am
cf6e1ff6: am
27176208: Merge "Clean up sanitizer configuration."
* commit '
cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
Clean up sanitizer configuration.
Dan Albert [Fri, 17 Apr 2015 16:57:54 +0000 (16:57 +0000)]
am
27176208: Merge "Clean up sanitizer configuration."
* commit '
2717620873fa1936779662a96de05033b89ddb19':
Clean up sanitizer configuration.
Dan Albert [Fri, 17 Apr 2015 16:47:00 +0000 (16:47 +0000)]
Merge "Clean up sanitizer configuration."
Dan Albert [Thu, 16 Apr 2015 23:21:02 +0000 (16:21 -0700)]
Clean up sanitizer configuration.
* Refactor a few pieces to avoid deeply nested conditionals.
* LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.
Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
Sami Tolvanen [Fri, 17 Apr 2015 15:28:08 +0000 (16:28 +0100)]
Calculate max_stashed_blocks correctly for block OTA v3
The updater automatically stashes overlapping source blocks to
make it possible to resume if the command performing the update
is interrupted. However, blockimgdiff.py does not take this into
account and therefore, max_stashed_blocks indicates only the
number of explicitly stashed blocks. Change blockimgdiff.py to
correctly calculate the maximum used stash space, including any
automatically stashed blocks.
Bug:
20309033
Change-Id: Ibf5cb1abc38c54e60a6ad3ce4cbce43556b08ac2
Lajos Molnar [Fri, 17 Apr 2015 06:13:31 +0000 (06:13 +0000)]
am
d6ba1cfd: am
35790525: am
3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
d6ba1cfdfb0c1792e2f2f1de5bd2c596a41a47cc':
core_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Fri, 17 Apr 2015 05:20:26 +0000 (05:20 +0000)]
am
35790525: am
3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
35790525cc756c72a44094f55970ec3b3d7e8a28':
core_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Fri, 17 Apr 2015 05:07:58 +0000 (05:07 +0000)]
am
3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
3a5602ebb8c365c252b6b9a6284996015d92ca33':
core_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Fri, 17 Apr 2015 04:58:21 +0000 (04:58 +0000)]
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
Ryosuke Matsuuchi [Fri, 17 Apr 2015 01:30:30 +0000 (10:30 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
Lajos Molnar [Wed, 15 Apr 2015 23:14:39 +0000 (16:14 -0700)]
core_base.mk: switch to new H264 and MPEG2 software codecs
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
Justin Klaassen [Fri, 17 Apr 2015 00:28:05 +0000 (17:28 -0700)]
Switch from Calculator to ExactCalculator
Bug:
20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
Glenn Kasten [Thu, 16 Apr 2015 23:59:05 +0000 (23:59 +0000)]
am
144423a0: am
9ec90ec8: am
1004eccb: Merge "Fix bookmark title"
* commit '
144423a0580fe03a00053da785bcfdc8e46a87b5':
Fix bookmark title
Glenn Kasten [Thu, 16 Apr 2015 23:37:23 +0000 (23:37 +0000)]
am
9ec90ec8: am
1004eccb: Merge "Fix bookmark title"
* commit '
9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
Fix bookmark title
Glenn Kasten [Thu, 16 Apr 2015 23:22:28 +0000 (23:22 +0000)]
am
1004eccb: Merge "Fix bookmark title"
* commit '
1004eccb166908b1411e966ca7f6fac315ad3bb0':
Fix bookmark title
Glenn Kasten [Thu, 16 Apr 2015 23:12:45 +0000 (23:12 +0000)]
Merge "Fix bookmark title"
Dirk Dougherty [Thu, 16 Apr 2015 22:28:45 +0000 (15:28 -0700)]
Doc change: increment metadata for updated Distribute landing page content.
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
Junda Liu [Thu, 16 Apr 2015 20:13:26 +0000 (20:13 +0000)]
Merge "Adding the new CarrierConfig app to the system image."
Glenn Kasten [Thu, 16 Apr 2015 18:56:22 +0000 (11:56 -0700)]
Fix bookmark title
Bug:
20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
Mark Salyzyn [Thu, 16 Apr 2015 17:53:46 +0000 (17:53 +0000)]
am
db6a4158: am
86e441fc: am
1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
* commit '
db6a4158fe45c1ff94fe71a94ea48ebb24c16799':
build: fs_config_generate must open file in binary mode
Mark Salyzyn [Thu, 16 Apr 2015 17:31:36 +0000 (17:31 +0000)]
am
86e441fc: am
1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
* commit '
86e441fc9c4191439b53b9917cf432ca2d16330a':
build: fs_config_generate must open file in binary mode
Jonathan Basseri [Tue, 7 Apr 2015 19:28:12 +0000 (12:28 -0700)]
Adding the new CarrierConfig app to the system image.
Bug: b/
19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
Mark Salyzyn [Thu, 16 Apr 2015 17:20:03 +0000 (17:20 +0000)]
am
1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
* commit '
1ff61a9b2d169477b476fdf4f03a92388f3ba444':
build: fs_config_generate must open file in binary mode
Mark Salyzyn [Thu, 16 Apr 2015 17:05:08 +0000 (17:05 +0000)]
Merge "build: fs_config_generate must open file in binary mode"
Lajos Molnar [Thu, 16 Apr 2015 16:40:35 +0000 (16:40 +0000)]
am
8cd7e944: am
fb102b1b: am
7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
* commit '
8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 16:19:14 +0000 (16:19 +0000)]
am
fb102b1b: am
7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
* commit '
fb102b1b5107fced1fb7cfdb98b051efb3575ec5':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 16:07:37 +0000 (16:07 +0000)]
am
7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
* commit '
7c794b165975c1d21753a46282dd3ea6da26fcb0':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 15:57:01 +0000 (15:57 +0000)]
Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
Lajos Molnar [Thu, 16 Apr 2015 15:49:08 +0000 (15:49 +0000)]
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
clang builds fail on the dependent libraries
This reverts commit
c628500ca5cfd46152e238e9dc24217a3d08b906.
Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8
Lajos Molnar [Thu, 16 Apr 2015 15:45:56 +0000 (15:45 +0000)]
am
ec1c2c0f: am
b5f7b187: am
161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
core_base.mk: switch to new H264 and MPEG2 software codecs
Mark Salyzyn [Thu, 16 Apr 2015 15:42:19 +0000 (08:42 -0700)]
build: fs_config_generate must open file in binary mode
Bug:
19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65
Lajos Molnar [Thu, 16 Apr 2015 15:24:42 +0000 (15:24 +0000)]
am
b5f7b187: am
161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
b5f7b18749a490a61eac66572ab1a009c608468b':
core_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Thu, 16 Apr 2015 15:13:05 +0000 (15:13 +0000)]
am
161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '
161c69714db0a5a12ef09d85533773b7ab6152d9':
core_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Thu, 16 Apr 2015 15:02:01 +0000 (15:02 +0000)]
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
Vinit Deshpande [Thu, 16 Apr 2015 02:36:02 +0000 (02:36 +0000)]
Merge changes from topic 'mwd-merge-041515'
* changes:
am
d8e3b5e..
bc7fc60 from mirror-m-wireless-internal-release
am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
am
5d1e929..
fae98a4 from mirror-m-wireless-internal-release
am "resolved conflicts for merge of
68000907 to lmp-mr..."
am
bcfe6fa..
7d5716e from mirror-m-wireless-internal-release
Mark Salyzyn [Thu, 16 Apr 2015 00:38:06 +0000 (00:38 +0000)]
am
d756e736: am
c9402076: am
7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit '
d756e7367ab60d5e4138d7561aaabf4256e3d247':
fs_config: Add fs_config_generate
Mark Salyzyn [Thu, 16 Apr 2015 00:15:47 +0000 (00:15 +0000)]
am
c9402076: am
7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit '
c9402076b65025c994c28bac0350d5b600d1d6fe':
fs_config: Add fs_config_generate
Mark Salyzyn [Wed, 15 Apr 2015 23:59:52 +0000 (23:59 +0000)]
am
7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit '
7a1d4d5e49a4068d8cf4fead175016c9b944c42b':
fs_config: Add fs_config_generate
Mark Salyzyn [Wed, 15 Apr 2015 23:50:43 +0000 (23:50 +0000)]
Merge "fs_config: Add fs_config_generate"
Lajos Molnar [Wed, 15 Apr 2015 23:14:39 +0000 (16:14 -0700)]
core_base.mk: switch to new H264 and MPEG2 software codecs
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
Mark Salyzyn [Wed, 15 Apr 2015 22:56:22 +0000 (22:56 +0000)]
am
54c1d36e: am
5a1c89e9: am
36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '
54c1d36eaee59c62a652b071bdec9e71c40002ae':
fs_config: use libcutils and libselinux shared libraries
Dan Albert [Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)]
am
3bc25d69: am
683a387e: am
4ed95088: Merge "Add support for ubsan."
* commit '
3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
Add support for ubsan.
Mark Salyzyn [Wed, 15 Apr 2015 22:40:50 +0000 (22:40 +0000)]
am
5a1c89e9: am
36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '
5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
fs_config: use libcutils and libselinux shared libraries
OSDN Git Service
