Commit graph

7397 commits

Author SHA1 Message Date
Zach Jang
0f1512bc03 Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
2015-10-19 17:57:33 -07:00
Dan Willemsen
57a64e015c Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:

  all-named-dirs-under
  all-subdir-named-dirs
  all-named-files-under
  all-subdir-named-files

This change also makes many of the current helpers use these helpers
instead of using their own implementation.

The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.

Bug: 24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
2015-10-13 16:14:57 -07:00
Dan Willemsen
7a74e5ee0e Add all-cpp-files-under
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.

Bug: 24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
2015-10-13 16:14:53 -07:00
Dan Willemsen
76a89d3a0a Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.

Bug: 24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
2015-10-13 16:14:12 -07:00
Zach Jang
1a78a8e7fb Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
2015-09-21 17:42:49 -07:00
Ying Wang
b79e8771ae Don't add build number to apps' version name for platform build.
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
2015-09-21 15:13:09 -07:00
Zach Jang
f694d37895 resolved conflicts for b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07:00
Zach Jang
b161297d4b am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit 'ab095b445af361911df2856e77f43c4cf103a0e2':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 19:05:33 +00:00
Zach Jang
ab095b445a am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '48e2b43e8cc030456b0f625f321c45d2e1775130':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 18:58:10 +00:00
Zach Jang
e539537d8c am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:16:43 +00:00
Zach Jang
7f96f4f6b9 am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '4c710cbe7f5786c3df396ea4283da920fd5c351b':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:04:23 +00:00
Zach Jang
48e2b43e8c am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:04:17 +00:00
Zach Jang
47ef4c3467 DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Zach Jang
4c710cbe7f DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:21:39 +00:00
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
Claes Elgemark
1a8c656704 am 8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '8d771971212069f77851163f437c782f581bf6db':
  Don't fail build of otatools if there are no device certificates
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121 Don't fail build of otatools if there are no device certificates
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07: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
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
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
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
c7a6f1e4f8 Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00
Tao Bao
2384d01c1c Revert "Adjust the size computation for reserved blocks"
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Dianne Hackborn
a42551685f Raise API level to 23.
Now apps can target both MNC and 23.

Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00
Ying Wang
78d1cba0f4 Fix conflict resolving error in ef5dc90bba
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Ying Wang
742f5832b1 Raise progaurd library to platform libraries even for "current" SDK.
Without this change, if an app with "LOCAL_SDK_VERSION := current" links
against a static library that uses removed APIs, the app will fail
ProGuard processing because the removed APIs can't be found in the
current SDK. This works around the issue.

Bug: 18510449
Bug: 20667396
Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
2015-06-26 19:37:28 +00:00
Mohamad Ayyash
aae1a0ba48 resolved conflicts for merge of 1a4658cd to mnc-dev 2015-06-25 17:24:05 -07:00
Mohamad Ayyash
1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Simon Wilson
b7b7aedeb3 Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev 2015-06-24 23:14:07 +00:00
Mohamad Ayyash
914811a9f2 Merge "Add img2simg in host and ota packages" into mnc-dev 2015-06-24 23:13:51 +00:00
Mohamad Ayyash
ef5dc90bba Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Simon Wilson
6d5ddc32ab resolved conflicts for merge of ecfc97f7 to mnc-dev
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash
353265b081 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Simon Wilson
ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Adam Powell
30638322e7 Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev 2015-06-24 20:32:15 +00:00
Adam Powell
0cf80f3ab8 Bump PLATFORM_PREVIEW_SDK_VERSION to 2
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
2015-06-24 13:04:22 -07:00
Mohamad Ayyash
9ff8a7162b am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
  Allow flashing a squashfs system image
2015-06-24 01:38:26 +00:00
Mohamad Ayyash
f35ed6bd84 resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 2015-06-23 16:22:32 -07:00
Tao Bao
efbb5d2e69 Adjust the size computation for reserved blocks
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
2015-06-23 14:53:28 -07:00
Simon Wilson
f86e7eeabc Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
leozwang
5c91af0d94 Merge "Add BUILD NUMBER into oem image." into mnc-dev 2015-06-22 00:36:06 +00:00
leozwang
92eb5703e5 Add BUILD NUMBER into oem image.
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
2015-06-20 21:05:19 -07:00
David Srbecky
ab13975219 Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.

(cherry picked from commit d8fae9a6a6)

Bug: 21924613
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
2015-06-19 02:34:58 +01:00
Mohamad Ayyash
cade49ddee Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
Tim Murray
b461acdedb Merge "Add support for cortex-a53 variants when building 64-bit." into mnc-dev 2015-06-12 18:37:11 +00:00
C. Sean Young
6f44670ada am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 17:43:46 +00:00
C. Sean Young
cbaead4cfe am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 16:29:25 +00:00
Tim Murray
b6b20af512 Add support for cortex-a53 variants when building 64-bit.
Change-Id: I3f1fb5dbde731d9c3d6db26a46bc7f0f54d8e071
2015-06-11 16:02:13 -07:00
Adrian Roos
6784cae413 Switch build to stricter aapt symbol generation
Prevents aapt from generating java symbols for strings that don't have
a default localization.

Bug: 21537397
Change-Id: I2f17397e33d823045f7dcff02e3d0817f3f81849
2015-06-10 20:00:13 +00:00
C. Sean Young
cf4699895a Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.

Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
2015-06-10 13:00:13 -05:00
Claes Elgemark
b5cd1f03c2 Add missing shared libraries to dist tools
(cherry pick from d0ec665727)

Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-09 09:16:27 -07:00
Dimitry Ivanov
72bced8a75 Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 18:33:00 +00:00
Narayan Kamath
cf7fbcd03d Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.

Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.

bug: 20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
2015-06-04 10:50:52 +00:00
Yohann Roussel
a9dd74c395 Merge "Add support for RMTYPEDEF with Jack" into mnc-dev 2015-06-02 09:36:27 +00:00
Ying Wang
226eb92321 Uncompress .so files before signing the apk.
- In uncompress-shared-libs we may strip .so files not for the current
  TARGET_ARCH. So we need to strip first and then sign the apk.
- For PRESIGNED apks, make sure we don't strip the .so files even if
   they are "fat".

Bug: 21571418
Bug: 8076853
Change-Id: Ifd1193dda0c2cd52ac148064ce5a32bcdd03f75c
2015-06-01 19:19:57 -07:00
Ying Wang
1fb0152ff7 Don't extract jni from prebuilt apks.
- We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always
  page-align jni shared libraries and store them umcompressed.
- For prebuilt apks, we don't extract jni any more; Instead we always run
  uncompress-shared-libs on them.
- For apks built from source, we still install the jni separately, because
  that way multiple apks can share the same jni and it saves space.

With this change, for most prebuilt apks, we don't need to specify
LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build
system automatically replaces the embedded jni with uncompressed files;
But if a prebuilt is a fat apk (i.e. containing jni not needed by the
current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to
specify what jni to keep. Otherwise all embedded jni will be replaced with
uncompressed files, that wastes space.

Bug: 8076853
Change-Id: Ic3666dc72bf17cd293787414dd185470b365f967
2015-06-01 19:19:45 -07:00
Andrew Hsieh
d760d4676b Revert "Revert "Enable linker -fix-cortex-a53-843419""
This reverts commit 32e1689684.

Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated

Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
2015-06-02 07:59:24 +08:00
Ying Wang
4fe7bfd373 Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.

Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
2015-06-01 10:43:29 -07:00
Chih-Hung Hsieh
ad2494bb79 Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.

BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
2015-05-29 10:27:58 -07:00
Yohann Roussel
5b2c6e26db Add support for RMTYPEDEF with Jack
Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-05-28 18:10:03 +02:00
Ying Wang
45c8b574b6 am b5f59372: am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit 'b5f5937280ef2d561d84be7f52d91a8dbecb87ef':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:40:49 +00:00
Ying Wang
b5f5937280 am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '30a411f0f61dd74fb870fb97b8d2129dbfb85024':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:24:19 +00:00
Ying Wang
58b3ee2863 am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '12f449756587b83cd6a04c793e05b837ceb41563':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:32:41 +00:00
Ying Wang
12f4497565 Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07:00
Patrick Tjin
899717ff2a Add huawei to vendor owner whitelist [DO NOT MERGE]
Change-Id: I4996eeb43e414f327e6e9b52564044771bfbc1c3
(cherry picked from commit 7f6fb274b7)
2015-05-27 03:31:38 +00:00
Kris Giesing
f93d8dd6c2 Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev 2015-05-22 18:58:18 +00:00
Jose Lima
b222b6e62c Add recommendation suport library to build
Change-Id: Ica884fa2bae30979dd7d17b18a004459ad161da3
2015-05-21 16:27:15 -07:00
Adam Powell
0d007cf6d0 Merge "Initialize ro.build.version.preview_sdk" into mnc-dev 2015-05-21 22:17:41 +00:00
Adam Powell
bdd5e8e7fe Initialize ro.build.version.preview_sdk
Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
2015-05-21 13:49:05 -07:00
Ying Wang
a6ffb929f4 FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Because we don't have 32-bit prebuilt libLLVM/libclang.

Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
(cherry picked from commit e5d4e74f9f)
2015-05-19 22:34:40 -07:00
Ying Wang
69425c1dcb am 44acba6d: am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '44acba6d37b1d13ef3a3ec6d89e5121f691089d9':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:15:47 +00:00
Ying Wang
44acba6d37 am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '02026edf4d104750fde070862636d29db4124b3a':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:03:22 +00:00
Ying Wang
bf6b82fbf1 am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '247f5c4fce9e2cf1911458be1591517c1e7dbc42':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:39:27 +00:00
Ying Wang
247f5c4fce am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:28:37 +00:00
Ying Wang
1bd155692f am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit 'e528e44d31498ad83482b1860036916d0fded379':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:11:27 +00:00
Ying Wang
e528e44d31 Merge "Add task to print transitive dependencies and their license files." into lmp-dev 2015-05-19 23:58:47 +00:00
Ying Wang
a1ea202256 Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
  $ make deps-license packages/app/% external/%
  prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".

Bug: 20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from 39b9b690a8)
2015-05-19 16:37:42 -07:00
Ying Wang
589e8c52fb Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
  TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
  dir.

Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Yohann Roussel
0a0b640f50 Merge "Save Jack default extra args in a file" into mnc-dev 2015-05-19 09:27:43 +00:00
Siva Velusamy
70b67accbf Don't exclude GPL binaries from the emulator system image
GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
2015-05-18 23:14:18 +00:00
Yohann Roussel
b6bfb5893a Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Vince Harron
a48c74fb3d Improved/clarified license guidance for GPL code.
This messaging approved by Google Open Source Licensing.

Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
2015-05-15 17:01:01 -07:00
Filip Gruszczynski
8eade31f98 am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '7fbb988da154ad91461c3d51994ae0ff99d94032':
  Add percent library to support libraries build.
2015-05-13 23:46:29 +00:00
dcashman
c0ba40b8a1 Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev 2015-05-13 18:38:18 +00:00
dcashman
49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

(cherry-pick of commit: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
Bart Sears
0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Dan Albert
93f22ee7e2 Merge "Disallow using stlport." into mnc-dev 2015-05-12 23:11:10 +00:00
Evgeniy Stepanov
04cfb9e113 Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-dev
* changes:
  --no-as-needed needs -Wl.
  Fix AddressSanitizer link order and multilib setup.
  Make asan more closely match clang behavior.
2015-05-12 22:34:16 +00:00
Dan Albert
bdd8ca0604 --no-as-needed needs -Wl.
Not sure why my checkbuild passed.

Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
2015-05-12 14:04:55 -07:00
Evgenii Stepanov
6708b6c99c Fix AddressSanitizer link order and multilib setup.
ASan runtime library (when using dynamic linking) must be the first
dependency of the main executable to achieve correct symbol
interposition. This matches how the clang driver works.

In multilib setup, ASan-RT name depends on the target arch:
  /system/lib/libclang_rt.asan-arm-android.so
  /system/lib64/libclang_rt.asan-arm64-android.so

We also set RPATH to /system/lib/asan or /system/lib64/asan
to have a place for ASan-only versions of system libraries.

Change-Id: I937d202077b6e433ba476c075d31be818b662d53
2015-05-12 13:40:29 -07:00
Dan Albert
eebb800170 Make asan more closely match clang behavior.
Always link libm with asan. Hasn't been a problem before because ASAN
was only ever used when libc++ was as well, which already links libm.

Pass --no-as-needed for host modules.

These aren't needed for the target builds because the target uses the
shared RTL.

Change-Id: I3b95c8682c0f63bac6b726f8cd15c638aaa98311
2015-05-12 13:40:26 -07:00
Ying Wang
480a9bb64e Keep Throwable's constructor that takes a String argument.
Bug: 20495321
Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
2015-05-11 14:56:20 -07:00
Filip Gruszczynski
8c97e1782b Add percent library to support libraries build.
Change-Id: I8d54f4249f609032fde1d015900204e284fc0c60
2015-05-11 11:58:01 -07:00
Andres Morales
821a554c1b Merge "[versionitis] pull image id from recovery into props" into mnc-dev 2015-05-08 22:04:27 +00:00
Andres Morales
b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Ying Wang
90598cb70c Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
2015-05-08 13:27:25 -07:00
Ying Wang
d508778493 Merge "Revert "Fix and cleanup."" into mnc-dev 2015-05-08 18:51:22 +00:00
Ying Wang
884738e4a6 Revert "Fix and cleanup."
This reverts commit f28bad5227.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
2015-05-08 18:51:00 +00:00
Ying Wang
22571e1857 Merge "Fix and cleanup." into mnc-dev 2015-05-08 18:11:55 +00:00
Dan Albert
0a4122a4f2 Disallow using stlport.
The only remaining users of stlport are vendor blobs. Prevent any new
users from using it.

Bug: http://b/15193147
Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
(cherry picked from commit 3a360a7353)
2015-05-08 09:56:48 -07:00
Ying Wang
1af02e6116 Merge "Fix Mac build." into mnc-dev 2015-05-08 03:59:15 +00:00
Ying Wang
b4b767a484 Fix Mac build.
Mac doesn't like "cp -r -L", but "cp -R -L".

Change-Id: I32bd8e5171db4ed811e158d91482671b14622825
2015-05-07 20:57:56 -07:00
Ying Wang
f28bad5227 Fix and cleanup.
- Detect java-source-list before transforming to java-source-list-uniq.
  This fixes non-fatal errors in build log like:
  /bin/bash:
  out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list:
  No such file or directory
- Cleaned the outdated incrementaljavac. Nobody is using this feature
  and now we switched to jack.

Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
2015-05-07 16:53:13 -07:00
Dmitriy Ivanov
f55c5a52ac Do not pack relocations for executables
Bug: http://b/20665974
Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67
(cherry picked from commit e24b6f77ff)
2015-05-07 14:12:00 -07:00
Yigit Boyar
8c7121de86 Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-dev 2015-05-07 01:40:10 +00:00
Yigit Boyar
fa358f7228 DO NOT MERGE Remove RecyclerView tests form pathmap
Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae37)
2015-05-07 01:13:53 +00:00
Jeff Brown
64434af772 Revert "Build docs for android-support-media-protocols.jar."
This reverts commit 5d0da1f959.

Bug: 20641986
Change-Id: I68d79186179b8b542b323ab630c6ed7620eb6f27
2015-05-06 16:02:20 -07:00
Chih-Hung Hsieh
0ba68bafa3 Upgrade x86 gcc to 4.9 and disable devirtualization.
Also filter out gcc-only flags -Wno-clobbered and -fno-devirtualize
when compiled with clang/llvm.

BUG: 19872411
Change-Id: I6de57583be04da607f569df65e93531787dbb789
(cherry picked from AOSP commit 90036610dd)
2015-05-06 00:24:18 +00:00
Ying Wang
4f5d0e60b4 Raise SDK version for ProGuard processing when app links support library.
When an app's LOCAL_SDK_VERSION is lower than the support library's
LOCAL_SDK_VERSION,  we artifically raises the "SDK version" "linked"
by ProGuard, to
- suppress ProGuard warnings of referencing symbols unknown to the
  lower SDK version.
- prevent ProGuard stripping subclass in the support library that
  extends class added in the higher SDK version.

This allows us to remove the dangerous ProGuard flag
"-dontwarn android.support.**".

Notes:
- We don't raise the app's LOCAL_SDK_VERSION, so that the app's own
  code is still unable to use the higher SDK version.
- For platform build, we can't just raise to the "current" SDK,
  because would break apps that use APIs removed from the current SDK.
  We raise it to framework.jar instead, which contains the most complete
  symbol set.

Bug: 20658265
Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7
(cherry picked from commit 8e8d1e7aba)
2015-05-05 17:35:12 +00:00
Yigit Boyar
a417909fde Remove RecyclerView tests form pathmap
Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae37)
2015-05-04 23:15:23 +00:00
Dmitriy Ivanov
258b29cf76 Pack module before making symbolic version
We need PT_LOAD segments to match for the gdb sake.
  If we pack module after stripping symbolic version
  PT_LOAD differ from actual ones; this confuses gdb.

Bug: http://b/20687795
Change-Id: If7b1ffcda918d0cc47051a30ca1202007ed62403
2015-05-04 12:42:51 -07:00
Ying Wang
069f1f8942 Deference symlinks when copying LOCAL_PICKUP_FILES.
Change-Id: I2399529ee9168bb93a4cad5daa61cd2ea500df04
2015-04-30 19:46:00 -07:00
Ying Wang
ffe376b49e Fix jack transformation on prebuilt AAR.
Change-Id: I74f932cff606138943d97b923bbd059bcd496e46
2015-04-30 09:55:08 -07:00
Dmitriy Ivanov
5924f142cc Revert "Revert "Pack relocations for mips64""
This reverts commit 6399dcce59.

Bug: http://b/20658994
(cherry picked from commit 8387d99ec3)
2015-04-29 23:11:03 -07:00
Dmitriy Ivanov
0cabfed78e Revert "Revert "Pack relocations for mips""
This reverts commit d05fd6fc82.

Bug: http://b/20658994
Change-Id: Iccbd4846b310306ed11b87f4566b8aaadfa63ebb
(cherry picked from commit cb2b3d47ad)
2015-04-29 15:44:20 -07:00
Dimitry Ivanov
8fb3350f1a Merge "Revert "Pack relocations for mips"" into mnc-dev 2015-04-29 19:37:46 +00:00
Dimitry Ivanov
d896883bfe Revert "Pack relocations for mips"
This reverts commit 9dc1a7359f.

Bug: http://b/20658994
Change-Id: Ib10c764a7d06db823ee2fccfa47240e0a639d4bc
(cherry picked from commit d05fd6fc82)
2015-04-29 12:33:19 -07:00
Dimitry Ivanov
3e037e36d0 Revert "Pack relocations for mips64"
This reverts commit 8bd30fe3cb.

Bug: http://b/20658994
Change-Id: I6c31094559a12b824344802bf3993f91aee79a26
(cherry picked from commit 6399dcce59)
2015-04-29 12:32:27 -07:00
Chris Banes
0e8383ca6f am 8f168d1b: Add design support library docs
* commit '8f168d1b986516112d103958070830c9075f6ce2':
  Add design support library docs
2015-04-29 09:17:22 +00:00
Chris Banes
8f168d1b98 Add design support library docs
BUG: 20524332
Change-Id: I471ab17a2a5ccc43f4ef0fa04b7c2e9077d56361
2015-04-28 12:01:49 +01:00
Elliott Hughes
4091bdb168 am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '6e40faa241b241f1c32edb40d36f9c407d8f6790':
  Fix a trivial comment typo.
2015-04-25 18:44:03 +00:00
Elliott Hughes
449849513b am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '162e19061c7fcdf9e212a561f75427cf1126ea67':
  Fix a trivial comment typo.
2015-04-25 18:23:50 +00:00
Elliott Hughes
b271669a0c Merge "Fix a trivial comment typo." 2015-04-25 18:04:21 +00:00
Elliott Hughes
ae1d4b0d18 Fix a trivial comment typo.
Bug: https://code.google.com/p/android/issues/detail?id=170069
Change-Id: Iacd308893561a991971b191d4d10a78ca82753d4
2015-04-25 11:02:40 -07:00
Nick Kralevich
b126ae9e3a am c98d6b35: am 6612d4a0: am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'c98d6b35ba7e9381089b1b7c8b47f384e5772a4f':
  host compiler: enable compiler hardening flags
2015-04-25 05:15:48 +00:00
Nick Kralevich
6612d4a088 am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'edc3371aeaf0f963d95b4d8bfb0e35b8b17ee648':
  host compiler: enable compiler hardening flags
2015-04-25 04:54:12 +00:00
Nick Kralevich
100acd1001 host compiler: enable compiler hardening flags
Enable the following compiler hardening flags:

* -Wl,-z,relro
* -Wl,-z,now
* -fstack-protector

relro / bind_now make the relro region read-only after linking,
preventing certain attacks against ELF data structures.

stack-protector adds stack canaries, which can detect exploits
which overwrite parts of the stack.

Explicitly not added in this change is FORTIFY_SOURCE=2. Adding that
option turns on glibc's warn_unused_result attributes. This generates
a huge number of new compile time warnings, and for the multiple
makefiles which have -Werror in them, turns those warnings into errors.
I'm not able to fix all the errors right away.

Bug: 20558757
Change-Id: I86791177c6695f5325233d9dd9a5dd3ccc2b1a2f
2015-04-24 21:26:08 -07:00
Dmitriy Ivanov
0be46e11a6 am 80421984: am aac1b9d9: am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit '804219841d7f581cf78f3f68e13381b6631513a0':
  Pack relocations for mips64
2015-04-25 00:31:30 +00:00
Dmitriy Ivanov
aac1b9d9bf am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit 'f674a67d6ef3d446dd726ce9600bd905815506b6':
  Pack relocations for mips64
2015-04-25 00:09:51 +00:00
Dmitriy Ivanov
155d7cc845 am 7347196a: am df7afb47: am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '7347196acbf640caaf68e4e790489a40d770a083':
  Do not pack relocations for prebuilts by default
2015-04-24 23:36:21 +00:00
Dmitriy Ivanov
8bd30fe3cb Pack relocations for mips64
Bug: http://b/18051137
Change-Id: I063c5d6cf007658c0efe9cb1d65ed8026b3e7dae
2015-04-24 16:34:09 -07:00
Dmitriy Ivanov
df7afb47d8 am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '3b023915e8374341c6a69cd40b0811e10b3cb1b5':
  Do not pack relocations for prebuilts by default
2015-04-24 23:14:00 +00:00
Dmitriy Ivanov
4fa4e4befd Merge "Do not pack relocations for prebuilts by default" 2015-04-24 22:56:08 +00:00
Dmitriy Ivanov
64762c3027 Do not pack relocations for prebuilts by default
Do not pack relocations for prebuilds unless
 LOCAL_PACK_MODULE_RELOCATIONS is true

Bug: http://b/20537715
Bug: http://b/18051137
Change-Id: Iddef3b09741da6ae10d73c98103b868cc7695d38
2015-04-24 15:33:14 -07:00
Dmitriy Ivanov
a705b5651d am 10537b6f: am 513be561: am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit '10537b6f41342c50fc0c80bd85ff1b126054086f':
  Pack relocations for mips
2015-04-24 21:09:38 +00:00
Dmitriy Ivanov
513be561e9 am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit 'cae4652514c220d1b8d9fbbdca1204bc6cb25954':
  Pack relocations for mips
2015-04-24 20:05:03 +00:00
Dmitriy Ivanov
9dc1a7359f Pack relocations for mips
Bug: http://b/18051137
Change-Id: Id5e0adfb55273f23e1c99b4eecb318c6b8d19989
2015-04-24 12:20:02 -07:00
Dmitriy Ivanov
d96e487b9b am 5754ad7e: am 5c327ec3: am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '5754ad7ead23fb613f9fe4de2970283d18141ea5':
  Pack relocations for x86
2015-04-24 18:28:05 +00:00
Dmitriy Ivanov
5c327ec39c am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '0f7ecd648bd5aa7f2798615559eb2cfd72e5d918':
  Pack relocations for x86
2015-04-24 18:07:03 +00:00
Dmitriy Ivanov
b1c2727aec Merge "Pack relocations for x86" 2015-04-24 17:44:09 +00:00
Dmitriy Ivanov
1d4804ccd1 Pack relocations for x86
Bug: http://b/18051137
Change-Id: I3f316343e9bbd2037a9583d5b6fb41a06be153cd
2015-04-24 10:34:59 -07:00
Dmitriy Ivanov
7fa5ba1d22 am 6a2b812b: am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit '6a2b812b8cc5ac7ea051d2c09651e12d08217919':
  Disable packed relocations for NDK builds
2015-04-24 05:30:47 +00:00
Dmitriy Ivanov
cda3d43345 am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit 'eacc8a052f30fc78a9b593a8b7bd4f0f8f5eb7d3':
  Disable packed relocations for NDK builds
2015-04-24 05:10:51 +00:00
Dmitriy Ivanov
3b51f20be9 Disable packed relocations for NDK builds
Bug: http://b/20537715
Change-Id: I1289a88d5eb694980b026b695cb25edd8ba76ed5
2015-04-23 18:55:23 -07:00
Dmitriy Ivanov
be55caf288 am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '6f2935dc1432a38e149498b6efbd43ed9aceb827':
  Pack relocation tables for dynamic executables
2015-04-23 23:16:36 +00:00
Dmitriy Ivanov
dabf96ab0a am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit 'c84b3a781c0065cba994e8cdd49b6bdb51e93399':
  Pack relocation tables for dynamic executables
2015-04-23 22:35:01 +00:00