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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dirk Dougherty
aee6585c32
Update js/css versions and add pt-br.
...
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
2015-07-08 04:12:19 -07:00
Dirk Dougherty
4187cee61b
am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
* commit '0b9e204df09d9630db24f61bb427110501df6743':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:06:54 +00:00
dcashman
2a3a2dc33c
Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
2015-07-06 15:51:07 +00:00
Chris Elliott
a80307b88e
am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit 'a0cca8e66ac124c5d78fe35e10ece83c5314734b':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:48:42 +00:00
Chris Elliott
a0cca8e66a
am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit '1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:36:55 +00:00
Dirk Dougherty
0b9e204df0
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
2015-07-02 14:21:55 -07:00
Chris Elliott
1e253e76b9
Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce
DO NOT MERGE Fix the syntax error in the edify script generator
...
file_getprop() always expects two arguments.
Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-07-02 13:17:21 -07:00