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
Tao Bao
15b42c4267
am cce673b6: Read fstab from the source build.
...
* commit 'cce673b675fadb9e509779cec838a1b545126cc4':
Read fstab from the source build.
2015-07-29 21:58:06 +00:00
Tao Bao
cce673b675
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 dd24da9ec9
)
2015-07-29 14:30:08 -07:00
Dianne Hackborn
307631b057
Remove M codename, version number is 6.0.
...
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
2015-07-29 14:22:51 -07:00
Miao Wang
88618b8ee9
am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
...
* commit '73f967b717bdccbcaf22a4d387e3241f89b49229':
[RenderScript] Only upgrade RS target API for compat build.
2015-07-29 19:59:47 +00:00
Miao Wang
73f967b717
am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
...
* commit 'b7a3bc569cf8bc928391440db5113dc8f1f12399':
[RenderScript] Only upgrade RS target API for compat build.
2015-07-29 19:48:15 +00:00
Ian Pedowitz
2770497a39
am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit '3a6d12908769821dde224c2ee23ab129cac88182':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 19:37:28 +00:00
Miao Wang
b7a3bc569c
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.
2015-07-29 19:23:45 +00:00
Ian Pedowitz
3a6d129087
am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit '9e8d2278613976863fb63c4e5c9d70046f2e4317':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 19:13:17 +00:00
Miao Wang
fbf80e9d62
Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
2015-07-29 19:07:48 +00:00
Ian Pedowitz
9e8d227861
am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit '96585b06dfb29023adc7097423c9ef266d13ac30':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 19:00:02 +00:00
Miao Wang
473a832dc4
am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit '489d3ea76a4910994b0f2d06dfed43e7b69ca581':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:50:23 +00:00
Ian Pedowitz
96585b06df
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
2015-07-29 18:48:26 +00:00
Miao Wang
a11f6c2f0e
[RenderScript] Only upgrade RS target API for compat build.
...
- Fix build
Bug: 22796994
Bug: 22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
2015-07-29 11:46:23 -07:00
Miao Wang
489d3ea76a
am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit '1a30e0364184fc0beac68faaf798715a46793420':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:27:38 +00:00
Miao Wang
1a30e03641
am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:05:06 +00:00
Ian Pedowitz
db042bdccd
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
...
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
2015-07-29 10:37:24 -07:00
Miao Wang
302e944c60
[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
2015-07-28 19:30:20 -07:00
George Mount
63daab9ff5
am 21d884f6: (-s ours) am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '21d884f6ac331339db2f46b7dbe2f56286b783a6':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:28:40 +00:00
George Mount
21d884f6ac
am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '0cd3e17f5bc819a45fd824a00ca44c0ea61c1c12':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:16:34 +00:00
George Mount
0cd3e17f5b
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.
2015-07-27 15:02:40 +00:00
George Mount
18cf7136a6
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.
2015-07-27 14:49:18 +00:00
George Mount
56f7b77520
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.
2015-07-27 14:35:51 +00:00
Dan Albert
d7e31a3995
am 2183dcb2: am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
...
* commit '2183dcb2e315c652f1a0dd553098e2fbb6715035':
Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-24 03:02:38 +00:00
Dan Albert
2183dcb2e3
am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
...
* commit '215959e77d345899fbafa20f765b497b3ac37301':
Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-22 20:23:12 +00:00
Dan Albert
215959e77d
Revert "Revert "Hide unwinder symbols in each binary.""
...
Bug: 18471342
Bug: 19958712
This reverts commit 61f675bb53
.
Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
(cherry picked from commit 686a557689
)
2015-07-21 15:51:10 -07:00
Ying Wang
a0ef4986b4
am 80ba4a3f: am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
* commit '80ba4a3fb986b9b536c9118aeb59741f7e206110':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:15:04 +00:00