Zach Jang
9f7c37811b
am 057831bc
: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
...
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:04:40 +00:00
Tao Bao
ccad82c52e
Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
2015-09-01 19:02:24 +00:00
Zach Jang
4d034675f0
Set the Security Patch level with Oct 1 for MNC
...
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
2015-08-31 10:12:17 -07:00
Ying Wang
d0cc11e898
am 8f7c08ed
: am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
2015-08-27 01:37:53 +00:00
Ying Wang
8f7c08ed62
am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
2015-08-27 01:27:37 +00:00
Tao Bao
7540c08807
Revert "Temporarily use blockimgdiff v2 for OTA."
...
This reverts commit d07bfc5196
.
Real fixes [1][2][3] are ready to merge. Time to revert the workaround.
[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49
Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
2015-08-26 15:29:00 -07:00
Ying Wang
1e120181f0
am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
2015-08-26 20:17:16 +00:00
Bart Sears
8a1fa15844
am c69aa42b
: Merge "Set the Security Patch level for MNC" into mnc-dev
...
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
Set the Security Patch level for MNC
2015-08-26 03:49:10 +00:00
Ying Wang
473b6a5f2b
am fc028e59
: Dist the otatools package.
...
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Bart Sears
0bb3145b56
Set the Security Patch level for MNC
...
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
2015-08-24 23:22:20 -07:00
Doug Zongker
2bcfbe7e88
am 32bf3f32
: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Doug Zongker
32bf3f3265
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef
)
2015-08-24 15:43:40 -07:00
Chris Banes
98c570abb2
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
2015-08-13 17:36:49 +00:00
Chris Banes
b916a5bcbc
Make sure only AppCompat (not it's tests) are in the docs
...
BUG: 23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
897f3ba8b1
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
2015-08-13 00:54:30 +00:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07: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
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
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
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
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
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
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
Dianne Hackborn
307631b057
Remove M codename, version number is 6.0.
...
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
2015-07-29 14:22:51 -07: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
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
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
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
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
80ba4a3fb9
am c671a7cf
: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:00:55 +00:00
Ying Wang
c671a7cf5c
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
2015-07-20 21:26:53 -07:00
Ying Wang
e9b4605a9a
am 7ac6cb80
: Add LOCAL_NO_LIBGCC.
...
* commit '7ac6cb804083a67d31a16b910dabfb76b30150a3':
Add LOCAL_NO_LIBGCC.
2015-07-16 22:18:19 +00:00
Ying Wang
7ac6cb8040
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 75011b2003
)
2015-07-16 13:36:47 -07:00
Ying Wang
e421b10f1c
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.
2015-07-16 19:01:55 +00:00