StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,372 Commits 1 Branch 0 Tags
f8a714ba6f1bfbb7abc7eeeba439be42e76b7f21
Commit Graph

23372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
George Mount
a584135544 DO NOT MERGE ANYWHERE. Add data binding to built javadoc. 
Bug 22175560

Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
 2015-07-20 16:48:58 -07:00
Ying Wang
e3927d79fa am e9b4605a: am 7ac6cb80: Add LOCAL_NO_LIBGCC. 
* commit 'e9b4605a9a42ce30857a1389463a81a99b0dd688':
  Add LOCAL_NO_LIBGCC.
 2015-07-16 22:33:50 +00: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
f943e811fe am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev 
* commit 'e421b10f1c50aa11bd4ca299537c16bac0263da8':
  Don't uncompress/page-align the jni libraries in apps_only build.
 2015-07-16 19:10:08 +00:00