OSDN Git Service
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 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
Dan Albert [Wed, 15 Apr 2015 22:32:08 +0000 (22:32 +0000)]
am
683a387e: am
4ed95088: Merge "Add support for ubsan."
* commit '
683a387efb079fefd3d2895875868b7c2a5a4a06':
Add support for ubsan.
Mark Salyzyn [Wed, 15 Apr 2015 22:31:26 +0000 (22:31 +0000)]
am
36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '
36fb373adfe8bbf9397dc8ccf405fd4d6baeef2f':
fs_config: use libcutils and libselinux shared libraries
Mark Salyzyn [Wed, 15 Apr 2015 22:22:42 +0000 (22:22 +0000)]
Merge "fs_config: use libcutils and libselinux shared libraries"
Dan Albert [Wed, 15 Apr 2015 22:21:24 +0000 (22:21 +0000)]
am
4ed95088: Merge "Add support for ubsan."
* commit '
4ed95088425a7de5b4fac37fff4888f0a187d5d6':
Add support for ubsan.
Dan Albert [Wed, 15 Apr 2015 22:06:09 +0000 (22:06 +0000)]
Merge "Add support for ubsan."
Ying Wang [Wed, 15 Apr 2015 21:39:26 +0000 (14:39 -0700)]
resolved conflicts for merge of
eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
Mark Salyzyn [Wed, 1 Apr 2015 21:41:29 +0000 (14:41 -0700)]
fs_config: Add fs_config_generate
fs_config_generate_$(TARGET_DEVICE) is built based off the content
of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules
fs_config_dirs and fs_config_file to utilize this command
for target contents:
fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir
fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file
In order to use this feature, one must have the fs_config_dirs and
fs_config_files in the $(PRODUCT_PACKAGES) list defined in the
device make files in $(TARGET_DEVICE_DIR). And either an
android_filesystem_config.h file in that directory, or define a
path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one.
Bug:
19908228
Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
Mark Salyzyn [Wed, 15 Apr 2015 19:53:39 +0000 (12:53 -0700)]
fs_config: use libcutils and libselinux shared libraries
- move to libcutils.so and libselinux.so as shared now that
they are in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug:
19908228
Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa
Kenny Root [Wed, 15 Apr 2015 20:12:21 +0000 (20:12 +0000)]
am
68dc5196: am
03c6e8c5: Merge "Move package signing after file stripping"
* commit '
68dc5196226406db84a41a03fe70e6278ed35fcd':
Move package signing after file stripping
Kenny Root [Wed, 15 Apr 2015 20:05:57 +0000 (20:05 +0000)]
am
03c6e8c5: Merge "Move package signing after file stripping"
* commit '
03c6e8c58686ffe611952d363de21b54f813ca41':
Move package signing after file stripping
Kenny Root [Wed, 15 Apr 2015 19:58:20 +0000 (19:58 +0000)]
Merge "Move package signing after file stripping"
Kenny Root [Wed, 15 Apr 2015 19:09:32 +0000 (12:09 -0700)]
Move package signing after file stripping
For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.
Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.
Bug:
20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
Ying Wang [Wed, 15 Apr 2015 17:10:04 +0000 (17:10 +0000)]
Merge "Auto-clean host tools when switching between apps_only and platform build."
Mark Salyzyn [Wed, 15 Apr 2015 15:28:39 +0000 (15:28 +0000)]
am
d6d6077c: am
2f1bc255: am
8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '
d6d6077c999e4ef335312f2740d5d7ad20572f79':
disttools: add liblog, libcutils and libselinux shared libraries
Mark Salyzyn [Wed, 15 Apr 2015 15:05:55 +0000 (15:05 +0000)]
am
2f1bc255: am
8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '
2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
disttools: add liblog, libcutils and libselinux shared libraries
Mark Salyzyn [Wed, 15 Apr 2015 14:55:48 +0000 (14:55 +0000)]
am
8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '
8b75ec1c7b6efa79f358725d0fd7a3932fd273e5':
disttools: add liblog, libcutils and libselinux shared libraries