Ian Pedowitz
c055f9b51a
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
2015-08-11 21:59:25 +00:00
Ian Pedowitz
e5a631585a
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
2015-08-11 21:54:17 +00:00
Clay Murphy
540abfef5e
am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '87492b889d2d90512c1e7129e3e5d04339d9e0e2':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:19:20 +00:00
Clay Murphy
87492b889d
am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '86e510cc313a464870ff82a9cd7f7206ea4aeb63':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:12:33 +00:00
Clay Murphy
86e510cc31
am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:24 +00:00
Clay Murphy
71a33c4d5b
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
2015-08-11 20:55:24 +00:00
Mike Dodd
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz
c7e051e0b1
am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '112f4c07c7de4bdb28aeb150233b24e7b1463f86':
Increasing x86 emulator system partition size
2015-08-11 19:33:04 +00:00
Ian Pedowitz
112f4c07c7
am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '0150dae61563c44dfb12a6d367a4f4f72253fcc4':
Increasing x86 emulator system partition size
2015-08-11 19:26:21 +00:00
Ian Pedowitz
0150dae615
am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:13 +00:00
Ian Pedowitz
073f74d908
Merge "Increasing x86 emulator system partition size" into mnc-dev
2015-08-11 19:12:28 +00:00
Ian Pedowitz
dfb29da864
am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
* commit 'c396ce6240dec53682ba6d2fe31ac155d4342d65':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:52:59 +00:00
Ian Pedowitz
c396ce6240
am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
* commit 'c79c7d152f6c481992748f6fe4bb3cc82233ae4d':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:47:14 +00:00
Ian Pedowitz
c79c7d152f
am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:41:08 +00:00
Ian Pedowitz
a18c5028d7
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
2015-08-11 10:02:15 -07:00
Ian Pedowitz
a55418206b
am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
* commit '817a2d2baa0df3ad2b30ff924b51aa5d08194201':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:30:38 +00:00
Ian Pedowitz
817a2d2baa
am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
* commit 'e2312db19ae06eef0c4d8fd2da668b345ad3070d':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:24:01 +00:00
Ian Pedowitz
e2312db19a
am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:17:29 +00:00
Ian Pedowitz
38ffb0cf89
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Ian Pedowitz
5394e8bd12
Increasing x86 emulator system partition size
...
Seems sdk_google_phone_x86 is building larger than 750MB
Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
Omari Stephens
a76428792f
Add the ability to display annotations in the generated docs
...
(cherry-picked from commit 87c44d8a11
)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-10 17:48:08 -07:00
Furquan Shaikh
7bb7a5f94e
am f8a714ba: am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
...
* commit 'f8a714ba6f1bfbb7abc7eeeba439be42e76b7f21':
releasetools: Fix parameters for vboot_signer
2015-08-10 19:40:06 +00:00
Furquan Shaikh
f8a714ba6f
am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
...
* commit '9f5c487ef586d20c273cafba6ce663287ef6a37a':
releasetools: Fix parameters for vboot_signer
2015-08-10 19:34:16 +00:00
Furquan Shaikh
9f5c487ef5
Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
2015-08-10 19:27:36 +00:00
Furquan Shaikh
852b8de43f
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>
2015-08-10 11:43:45 -07:00
Furquan Shaikh
449b8a0664
am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit 'c4904316ad9a1f84ffd9de43cf82eb452b5d8556':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:41:39 +00:00
Furquan Shaikh
c4904316ad
am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit 'ffe86de5d04ad7a71c2d48478d85b39db5c441eb':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:31:32 +00:00
Furquan Shaikh
ffe86de5d0
Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
2015-08-09 08:38:07 +00:00
Furquan Shaikh
e8c212235f
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>
2015-08-07 12:01:20 -07:00
Yusuf Ozuysal
734dadd8b1
am cd90b3cd: am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit 'cd90b3cd296559cb1c846bceb1598cf6a8640225':
Add support-customtabs to the doc build.
2015-08-07 00:35:04 +00:00
Yusuf Ozuysal
cd90b3cd29
am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit 'b1014924b70be4b169877c29e60b9a15b74cd647':
Add support-customtabs to the doc build.
2015-08-07 00:27:20 +00:00
Yusuf Ozuysal
b1014924b7
am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
Add support-customtabs to the doc build.
2015-08-07 00:20:36 +00:00
Yusuf Ozuysal
736463f86c
Merge "Add support-customtabs to the doc build." into mnc-dev
2015-08-07 00:10:39 +00:00
Ying Wang
60df344458
am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '0247fe72c05eb27ffb20f14d4b05458bb8641a38':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:36:32 +00:00
Ying Wang
0247fe72c0
am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:28:49 +00:00
Ying Wang
16d0b4cff1
am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:20:54 +00:00
Ying Wang
66c8e8c756
Don't prepend CC_WRAPPER to CLANG.
...
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
2015-08-03 14:06:58 -07:00
Dianne Hackborn
969016a37c
am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
...
* commit 'f4dbf25a6eaa5de12f33f60d8161ac87c1388173':
Remove M codename, version number is 6.0.
2015-08-01 16:51:31 +00:00
Dianne Hackborn
f4dbf25a6e
am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
...
* commit '4b4244cb03bb6f5339859c4631717fe0ddeec4e8':
Remove M codename, version number is 6.0.
2015-08-01 16:34:31 +00:00
Dianne Hackborn
4b4244cb03
am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
...
* commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36':
Remove M codename, version number is 6.0.
2015-07-31 19:42:26 +00:00
Dianne Hackborn
56866c4d0e
Merge "Remove M codename, version number is 6.0." into mnc-dev
2015-07-31 17:37:50 +00:00
Benoit Lize
0e14dcc000
Add support-customtabs to the doc build.
...
b/22795013
Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
2015-07-31 17:36:37 +02:00
Tony Mantler
c2a1c8dac8
am b362f89e: am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
...
* commit 'b362f89e1588fb309d5bc5be02f9aecdaff1c7c1':
Add support preference libraries to docs build
2015-07-30 20:18:16 +00:00
Tony Mantler
b362f89e15
am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
...
* commit 'd9bb53f965caa4f961b822e63c486c2863b29a7c':
Add support preference libraries to docs build
2015-07-30 20:11:07 +00:00
Tony Mantler
d9bb53f965
am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
...
* commit '5915e57db504914c02d36e8f8cc18767c40f9c2d':
Add support preference libraries to docs build
2015-07-30 20:02:55 +00:00
Tony Mantler
5915e57db5
Merge "Add support preference libraries to docs build" into mnc-dev
2015-07-30 19:56:08 +00:00
Tony Mantler
c8b469aec5
Add support preference libraries to docs build
...
b/22795957
Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
2015-07-30 11:22:24 -07:00
Tao Bao
df7c215cd7
am bba2c512: am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit 'bba2c51264a21147f79f62762591afa93c965eb6':
Read fstab from the source build.
2015-07-29 22:23:26 +00:00
Tao Bao
bba2c51264
am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit '15b42c426715c2221f49d0cf2181ba869b84bc94':
Read fstab from the source build.
2015-07-29 22:11:44 +00:00