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
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
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
Ying Wang
e8ecab8d09
Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev
2015-07-16 18:51:19 +00:00
George Mount
daf97ac2b6
am 54152d30
: am 087243dd
: Merge "Add data binding to built javadoc." into mnc-dev
...
* commit '54152d3062b436a0bb060544f1311d124c81bdbe':
Add data binding to built javadoc.
2015-07-16 14:42:21 +00:00
George Mount
54152d3062
am 087243dd
: Merge "Add data binding to built javadoc." into mnc-dev
...
* commit '087243ddcb61b602f4d4eb03022844021a659fda':
Add data binding to built javadoc.
2015-07-16 14:29:34 +00:00
George Mount
087243ddcb
Merge "Add data binding to built javadoc." into mnc-dev
2015-07-16 14:18:43 +00:00
Ying Wang
1f8964d388
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
2015-07-15 18:34:20 -07:00
Thierry Strudel
7f798c6c31
am 8d7066c1
: am 6b74f21a
: oem_image/custom_image: fix missing new parameter to build_image.py
...
* commit '8d7066c148cb1a2ed3c1b3f41cafda36a4efe2d2':
oem_image/custom_image: fix missing new parameter to build_image.py
2015-07-13 23:48:39 +00:00
George Mount
5349e7dd6b
Add data binding to built javadoc.
...
Bug 22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
2015-07-13 16:44:44 -07:00
Thierry Strudel
8d7066c148
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
2015-07-13 23:31:15 +00:00
Paul Crowley
460a5abbee
am 70198185
: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
...
* commit '701981851110d6931195a5898c521bf8cdab2bae':
Build "secdiscard" for securely discarding data from flash devices.
2015-07-13 22:34:44 +00:00
Thierry Strudel
6b74f21a4d
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>
2015-07-13 14:46:49 -07:00
Paul Crowley
7019818511
Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
2015-07-13 20:54:43 +00:00
Tao Bao
0e66c70d01
am d07bfc51
: Temporarily use blockimgdiff v2 for OTA.
...
* commit 'd07bfc519673fdba66448f0a81ef869b922c3804':
Temporarily use blockimgdiff v2 for OTA.
2015-07-13 15:11:36 +00:00
Tao Bao
d07bfc5196
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
2015-07-12 23:45:24 -07:00
Tao Bao
d2e77d6ec5
am 7f8ecb7f
: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev
...
* commit '7f8ecb7f5c21630a75c69d170ba2b401d7a311a5':
Zero out blocks that may be touched by dm-verity.
2015-07-10 21:09:40 +00:00
Tao Bao
7f8ecb7f5c
Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev
2015-07-10 20:44:25 +00:00
Tao Bao
2fd2c9bfd6
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
2015-07-10 12:16:56 -07:00
Thierry Strudel
a69dcefda3
am 74a81e66
: fix device specific fs_config on build server
...
* commit '74a81e6633276d92337749a5ee9d921207814dd4':
fix device specific fs_config on build server
2015-07-10 18:57:38 +00:00
Thierry Strudel
74a81e6633
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>
2015-07-10 10:55:54 -07:00
Tao Bao
38a534b693
resolved conflicts for merge of 610754e5
to cw-e-dev
...
Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491
2015-07-08 10:43:31 -07:00
Dirk Dougherty
26b3ec5a68
am 0da02191
: am aee6585c
: Update js/css versions and add pt-br.
...
* commit '0da02191ccc2030a3b4ac81500fdcabb72570049':
Update js/css versions and add pt-br.
2015-07-08 11:44:24 +00:00
Dirk Dougherty
0da02191cc
am aee6585c
: Update js/css versions and add pt-br.
...
* commit 'aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
2015-07-08 11:29:45 +00:00
Dirk Dougherty
bb18cb1a0c
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).
2015-07-08 11:21:57 +00:00