OSDN Git Service
Konstantinos Menychtas [Tue, 18 Aug 2015 18:28:45 +0000 (18:28 +0000)]
am
956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '
956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Dirk Dougherty [Sun, 16 Aug 2015 23:57:48 +0000 (23:57 +0000)]
am
6a8f88cd: adjust image placement for m hero on medium screens.
* commit '
6a8f88cdec931470256ade35ffe6b8097425e36f':
adjust image placement for m hero on medium screens.
Dirk Dougherty [Sat, 15 Aug 2015 04:18:36 +0000 (21:18 -0700)]
adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
Joe Fernandez [Thu, 13 Aug 2015 23:11:45 +0000 (23:11 +0000)]
am
71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '
71e0a80c2c2fdc26bb014685eebb874aa40f782d':
doc change: Add hero image for m and css for landing pages.
Joe Fernandez [Thu, 13 Aug 2015 23:02:37 +0000 (23:02 +0000)]
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 19:37:34 +0000 (12:37 -0700)]
doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
Chris Banes [Thu, 13 Aug 2015 17:36:49 +0000 (17:36 +0000)]
am
743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '
743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
Chris Banes [Thu, 13 Aug 2015 17:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
Mike Dodd [Thu, 13 Aug 2015 15:22:44 +0000 (15:22 +0000)]
am
5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '
5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
Mike Dodd [Thu, 13 Aug 2015 15:16:38 +0000 (15:16 +0000)]
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
Chris Banes [Thu, 13 Aug 2015 08:38:12 +0000 (09:38 +0100)]
Make sure only AppCompat (not it's tests) are in the docs
BUG:
23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
Dianne Hackborn [Thu, 13 Aug 2015 00:54:30 +0000 (00:54 +0000)]
am
25abc5a3: Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:20 +0000 (16:11 -0700)]
Fix issie #
23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base AOSP telephony builds.
b/
23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
Ian Pedowitz [Wed, 12 Aug 2015 20:17:30 +0000 (20:17 +0000)]
am
a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '
a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
Ian Pedowitz [Wed, 12 Aug 2015 19:41:54 +0000 (19:41 +0000)]
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:58:59 +0000 (18:58 +0000)]
am
745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '
745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
Mike Dodd [Wed, 12 Aug 2015 18:53:47 +0000 (18:53 +0000)]
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:45 +0000 (18:48 +0000)]
Revert "Include new AOSP messaging app in base builds."
This reverts commit
a8b0905e165448857ad45d1633c545c53bd53a5e.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
Ian Pedowitz [Wed, 12 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug:
23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
Mike Dodd [Wed, 12 Aug 2015 17:49:48 +0000 (17:49 +0000)]
am
02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '
02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
Mike Dodd [Wed, 12 Aug 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
Tao Bao [Wed, 12 Aug 2015 07:03:42 +0000 (07:03 +0000)]
am
11cf92aa: am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:55:21 +0000 (06:55 +0000)]
am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:19:06 +0000 (23:19 -0700)]
skip the merge of
67e7c661 to lmp-mr1-ub-dev
The change (
007979ee) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
Tao Bao [Wed, 12 Aug 2015 05:18:37 +0000 (05:18 +0000)]
am
007979ee: Add support for clobbered blocks
* commit '
007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
Tao Bao [Tue, 12 May 2015 18:42:31 +0000 (11:42 -0700)]
Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/
20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit
ff7778166bd13a90c89fa333591ee2037f587a11)
Ian Pedowitz [Tue, 11 Aug 2015 21:59:25 +0000 (21:59 +0000)]
am
e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit '
e5a631585a7b07c329f9ada04c99ed04b6c16b62':
Increasing arm(64)? emulator partition sizes to 1.5GB
Ian Pedowitz [Tue, 11 Aug 2015 21:54:17 +0000 (21:54 +0000)]
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
Clay Murphy [Tue, 11 Aug 2015 21:04:24 +0000 (21:04 +0000)]
am
71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '
71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Clay Murphy [Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)]
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base builds.
b/
23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
Ian Pedowitz [Tue, 11 Aug 2015 19:48:46 +0000 (12:48 -0700)]
Increasing arm(64)? emulator partition sizes to 1.5GB
Bug:
23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
Ian Pedowitz [Tue, 11 Aug 2015 19:18:13 +0000 (19:18 +0000)]
am
073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit '
073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
Ian Pedowitz [Tue, 11 Aug 2015 19:12:28 +0000 (19:12 +0000)]
Merge "Increasing x86 emulator system partition size" into mnc-dev
Ian Pedowitz [Tue, 11 Aug 2015 17:41:08 +0000 (17:41 +0000)]
am
a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
* commit '
a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Ian Pedowitz [Tue, 11 Aug 2015 17:02:15 +0000 (10:02 -0700)]
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
Ian Pedowitz [Tue, 11 Aug 2015 16:17:29 +0000 (16:17 +0000)]
am
38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit '
38ffb0cf899d94cb72409519bd25dc94048dd719':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Ian Pedowitz [Tue, 11 Aug 2015 14:50:04 +0000 (07:50 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
Ian Pedowitz [Tue, 11 Aug 2015 03:18:41 +0000 (20:18 -0700)]
Increasing x86 emulator system partition size
Seems sdk_google_phone_x86 is building larger than 750MB
Bug:
23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
Omari Stephens [Sat, 6 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Add the ability to display annotations in the generated docs
(cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86)
Bug:
8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Furquan Shaikh [Mon, 10 Aug 2015 19:27:36 +0000 (19:27 +0000)]
Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
Furquan Shaikh [Mon, 10 Aug 2015 18:43:45 +0000 (11:43 -0700)]
releasetools: Fix parameters for vboot_signer
With the change in vboot_signer (CL:744257), an additional parameter
is required to vboot_signer script. This change adds the required
parameter to releasetools as well.
BUG=
23076037
Change-Id: Ice5329578b3a9bc459e278a9d404a1981b35ca88
Signed-off-by: Furquan Shaikh <furquan@google.com>
Furquan Shaikh [Sun, 9 Aug 2015 08:38:07 +0000 (08:38 +0000)]
Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
Furquan Shaikh [Fri, 7 Aug 2015 18:58:05 +0000 (11:58 -0700)]
vboot_signer: Add kernel subkey required for signing kernel keyblock
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.
TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.
Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com>
Yusuf Ozuysal [Fri, 7 Aug 2015 00:20:36 +0000 (00:20 +0000)]
am
736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
* commit '
736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
Add support-customtabs to the doc build.
Yusuf Ozuysal [Fri, 7 Aug 2015 00:10:39 +0000 (00:10 +0000)]
Merge "Add support-customtabs to the doc build." into mnc-dev
Ying Wang [Mon, 3 Aug 2015 21:20:54 +0000 (21:20 +0000)]
am
66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit '
66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
Don't prepend CC_WRAPPER to CLANG.
Ying Wang [Mon, 3 Aug 2015 21:06:58 +0000 (14:06 -0700)]
Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug:
22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
Dianne Hackborn [Fri, 31 Jul 2015 19:42:26 +0000 (19:42 +0000)]
am
56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '
56866c4d0e31bbc65e333754bb69accb2b0f4a36':
Remove M codename, version number is 6.0.
Dianne Hackborn [Fri, 31 Jul 2015 17:37:50 +0000 (17:37 +0000)]
Merge "Remove M codename, version number is 6.0." into mnc-dev
Benoit Lize [Fri, 31 Jul 2015 15:35:58 +0000 (17:35 +0200)]
Add support-customtabs to the doc build.
b/
22795013
Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
Tony Mantler [Thu, 30 Jul 2015 20:02:55 +0000 (20:02 +0000)]
am
5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit '
5915e57db504914c02d36e8f8cc18767c40f9c2d':
Add support preference libraries to docs build
Tony Mantler [Thu, 30 Jul 2015 19:56:08 +0000 (19:56 +0000)]
Merge "Add support preference libraries to docs build" into mnc-dev
Tony Mantler [Thu, 30 Jul 2015 18:22:24 +0000 (11:22 -0700)]
Add support preference libraries to docs build
b/
22795957
Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
Tao Bao [Wed, 29 Jul 2015 21:58:06 +0000 (21:58 +0000)]
am
cce673b6: Read fstab from the source build.
* commit '
cce673b675fadb9e509779cec838a1b545126cc4':
Read fstab from the source build.
Tao Bao [Wed, 29 Jul 2015 21:09:23 +0000 (14:09 -0700)]
Read fstab from the source build.
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.
Bug:
21948974
Change-Id: I8b6a18f64b412f782184f9d382544ed0ce093fb4
(cherry picked from commit
dd24da9ec91b74b7e3c8d1af9f1f9f792d41ac4d)
Dianne Hackborn [Wed, 29 Jul 2015 21:22:51 +0000 (14:22 -0700)]
Remove M codename, version number is 6.0.
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
Miao Wang [Wed, 29 Jul 2015 19:23:45 +0000 (19:23 +0000)]
am
fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
* commit '
fbf80e9d6294c9ab1989572faab888e4f8641b1c':
[RenderScript] Only upgrade RS target API for compat build.
Miao Wang [Wed, 29 Jul 2015 19:07:48 +0000 (19:07 +0000)]
Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
Ian Pedowitz [Wed, 29 Jul 2015 19:00:02 +0000 (19:00 +0000)]
am
96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
* commit '
96585b06dfb29023adc7097423c9ef266d13ac30':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
Ian Pedowitz [Wed, 29 Jul 2015 18:48:26 +0000 (18:48 +0000)]
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
Miao Wang [Wed, 29 Jul 2015 18:46:23 +0000 (11:46 -0700)]
[RenderScript] Only upgrade RS target API for compat build.
- Fix build
Bug:
22796994
Bug:
22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
Miao Wang [Wed, 29 Jul 2015 18:05:06 +0000 (18:05 +0000)]
am
302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit '
302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Ian Pedowitz [Wed, 29 Jul 2015 17:37:24 +0000 (10:37 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
Miao Wang [Wed, 29 Jul 2015 00:43:51 +0000 (17:43 -0700)]
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Bug:
22796994
Bug:
22693954
This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).
Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
George Mount [Mon, 27 Jul 2015 15:02:40 +0000 (15:02 +0000)]
am
18cf7136: (-s ours) am
56f7b775: (-s ours) am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
18cf7136a686b9fbac837736445ca7f2edd5947e':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:49:18 +0000 (14:49 +0000)]
am
56f7b775: (-s ours) am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
56f7b77520f182a42e181a0f6dba78559007c532':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:35:51 +0000 (14:35 +0000)]
am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
a58413554455248dcaea3ad1c022316c1e3288e7':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Dan Albert [Wed, 22 Jul 2015 20:23:12 +0000 (20:23 +0000)]
am
215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
* commit '
215959e77d345899fbafa20f765b497b3ac37301':
Revert "Revert "Hide unwinder symbols in each binary.""
Dan Albert [Tue, 23 Jun 2015 20:32:30 +0000 (13:32 -0700)]
Revert "Revert "Hide unwinder symbols in each binary.""
Bug:
18471342
Bug:
19958712
This reverts commit
61f675bb53f31fb2500fc135603ca7a5f7620d8e.
Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
(cherry picked from commit
686a5576890b3d5ea48ddc9da52b0c8aca75f876)
Ying Wang [Tue, 21 Jul 2015 21:00:55 +0000 (21:00 +0000)]
am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
Ying Wang [Tue, 21 Jul 2015 01:40:18 +0000 (18:40 -0700)]
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug:
22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
George Mount [Mon, 13 Jul 2015 23:44:44 +0000 (16:44 -0700)]
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Bug
22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
Ying Wang [Thu, 16 Jul 2015 22:18:19 +0000 (22:18 +0000)]
am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
7ac6cb804083a67d31a16b910dabfb76b30150a3':
Add LOCAL_NO_LIBGCC.
Ying Wang [Thu, 2 Jul 2015 18:05:27 +0000 (11:05 -0700)]
Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.
Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
(cherry picked from commit
75011b2003733edc483a45d61f5cb1a23f64bfbf)
Ying Wang [Thu, 16 Jul 2015 19:01:55 +0000 (19:01 +0000)]
am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
Don't uncompress/page-align the jni libraries in apps_only build.
Ying Wang [Thu, 16 Jul 2015 18:51:19 +0000 (18:51 +0000)]
Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev
George Mount [Thu, 16 Jul 2015 14:29:34 +0000 (14:29 +0000)]
am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
087243ddcb61b602f4d4eb03022844021a659fda':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:18:41 +0000 (14:18 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
Ying Wang [Thu, 16 Jul 2015 01:33:24 +0000 (18:33 -0700)]
Don't uncompress/page-align the jni libraries in apps_only build.
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.
Bug:
22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
George Mount [Mon, 13 Jul 2015 23:44:44 +0000 (16:44 -0700)]
Add data binding to built javadoc.
Bug
22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
Thierry Strudel [Mon, 13 Jul 2015 23:31:15 +0000 (23:31 +0000)]
am
6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py
* commit '
6b74f21a4d3ff7ed7bb8463210263e9ecb27830a':
oem_image/custom_image: fix missing new parameter to build_image.py
Thierry Strudel [Mon, 13 Jul 2015 21:40:36 +0000 (14:40 -0700)]
oem_image/custom_image: fix missing new parameter to build_image.py
Bug:
22441494
Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Paul Crowley [Mon, 13 Jul 2015 20:54:40 +0000 (20:54 +0000)]
Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
Tao Bao [Mon, 13 Jul 2015 06:45:24 +0000 (23:45 -0700)]
Temporarily use blockimgdiff v2 for OTA.
angler and bullhead have smaller cache partiton (~100MB) and hit issue
with incremental OTA (such as MDA09B to MDA12) that requires more stash
space with BBOTA v3. Temporarily use v2 as a workaround, until we come
up with a real fix. Note that BBOTA v2 still uses some stash space, but
should be much smaller than v3.
Bug:
22430577
Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
Tao Bao [Fri, 10 Jul 2015 20:44:24 +0000 (20:44 +0000)]
Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev
Tao Bao [Fri, 10 Jul 2015 00:37:49 +0000 (17:37 -0700)]
Zero out blocks that may be touched by dm-verity.
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.
Bug:
20881595
Change-Id: I54e24e70ad822c0d6d7af43301f74d24505f4461
Thierry Strudel [Thu, 9 Jul 2015 16:54:55 +0000 (09:54 -0700)]
fix device specific fs_config on build server
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
fs_config
fs_get_stats used by mktarball.sh
make_ext4fs used by mkuserimg.sh
mksquashfs used by mksquashfsimage.sh
Bug:
21989305
Bug:
22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Dirk Dougherty [Wed, 8 Jul 2015 11:44:24 +0000 (11:44 +0000)]
am
0da02191: am
aee6585c: Update js/css versions and add pt-br.
* commit '
0da02191ccc2030a3b4ac81500fdcabb72570049':
Update js/css versions and add pt-br.
Dirk Dougherty [Wed, 8 Jul 2015 11:29:45 +0000 (11:29 +0000)]
am
aee6585c: Update js/css versions and add pt-br.
* commit '
aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
Dirk Dougherty [Wed, 8 Jul 2015 11:21:57 +0000 (11:21 +0000)]
am
4187cee6: am
0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '
4187cee61b234a135ae2a62c876681a92e911893':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Dirk Dougherty [Wed, 8 Jul 2015 11:12:19 +0000 (04:12 -0700)]
Update js/css versions and add pt-br.
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
Dirk Dougherty [Wed, 8 Jul 2015 11:06:54 +0000 (11:06 +0000)]
am
0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '
0b9e204df09d9630db24f61bb427110501df6743':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
dcashman [Mon, 6 Jul 2015 15:51:06 +0000 (15:51 +0000)]
Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
Chris Elliott [Thu, 2 Jul 2015 22:48:42 +0000 (22:48 +0000)]
am
a0cca8e6: (-s ours) am
1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
* commit '
a0cca8e66ac124c5d78fe35e10ece83c5314734b':
DO NOT MERGE Fix the syntax error in the edify script generator
Chris Elliott [Thu, 2 Jul 2015 22:36:55 +0000 (22:36 +0000)]
am
1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
* commit '
1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
DO NOT MERGE Fix the syntax error in the edify script generator
Dirk Dougherty [Thu, 2 Jul 2015 21:21:55 +0000 (14:21 -0700)]
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2