Tao Bao
be9457cad2
Pack base_fs files into target_files.zip.
...
am: f54216f292
* commit 'f54216f29238a67aad1199a0e85d09e443740bf0':
Pack base_fs files into target_files.zip.
Change-Id: Ia68c3a707def1865151f071ca33a3bdc513f9045
2016-05-02 16:45:31 +00:00
Tao Bao
f54216f292
Pack base_fs files into target_files.zip.
...
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.
Reset the base_fs paths to point to the files in META/.
Also add blk_alloc_to_base_fs into otatools.zip.
Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
2016-04-30 23:56:10 -07:00
Chih-hung Hsieh
e49c261cb4
Merge "Suppress google-* checks in vendor modules." am: f2592e192d
...
am: 336e44fc3f
* commit '336e44fc3f832224e687ae3755fe1d2610800ce3':
Suppress google-* checks in vendor modules.
Change-Id: I6a60ec1ef74a7e83368e06139984d7c6f7bfc5ba
2016-04-30 00:47:06 +00:00
Chih-Hung Hsieh
336e44fc3f
Merge "Suppress google-* checks in vendor modules."
...
am: f2592e192d
* commit 'f2592e192da6fcea5233b073149751c9ee687ab9':
Suppress google-* checks in vendor modules.
Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
2016-04-30 00:44:49 +00:00
Chih-Hung Hsieh
30f86e4ab8
Suppress google-* checks in vendor modules.
...
Too many warnings in vendor code that we cannot fix yet.
Bug: http://b/27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
2016-04-29 15:16:59 -07:00
Adam Lesinski
54d4d765ba
Merge "Call aapt2 link with argument-list" into nyc-dev
...
am: dfd6197f51
* commit 'dfd6197f5173b957b6e41a83df66d04068fa6517':
Call aapt2 link with argument-list
Change-Id: I34e64e07736d428ca87044ac07a952be50531464
2016-04-29 22:13:20 +00:00
Adam Lesinski
dfd6197f51
Merge "Call aapt2 link with argument-list" into nyc-dev
2016-04-29 22:09:01 +00:00
Todd Kennedy
a9ce97d223
Merge "Only align when necessary" into nyc-dev
...
am: 1ccfe52630
* commit '1ccfe5263008991aeff10964da3bdc6c2c1c1d06':
Only align when necessary
Change-Id: I2452df91a9c97a0b7d2d182165384d63ce040a09
2016-04-29 21:02:31 +00:00
Todd Kennedy
1ccfe52630
Merge "Only align when necessary" into nyc-dev
2016-04-29 20:59:04 +00:00
Todd Kennedy
3f18099610
Only align when necessary
...
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
2016-04-29 13:58:13 -07:00
Adam Lesinski
8d1e2fdcba
Call aapt2 link with argument-list
...
Also follow symbolic links when looking for assets.
Bug:22775504
Change-Id: I971e23505f766a2192469df1aad55bc20c46f618
2016-04-28 15:10:18 -07:00
Adam Lesinski
9c5f7a462c
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
...
am: 6c078e0522
* commit '6c078e0522daafbdb5b2635baa510c2863bde2bb':
Revert "Call aapt2 link with argument-list"
Change-Id: I36d1080067620f991766a751830cac885fd1dc48
2016-04-28 20:15:41 +00:00
Adam Lesinski
6c078e0522
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
2016-04-28 20:10:17 +00:00
Adam Lesinski
4c44d94999
Revert "Call aapt2 link with argument-list"
...
This reverts commit d4d6a50fbb
.
Change-Id: If84ad9921eb51ae16eae2be3cf4b2ee86b31ce80
2016-04-28 20:06:53 +00:00
Adam Lesinski
2e58fba928
Merge "Call aapt2 link with argument-list" into nyc-dev
...
am: 0e57d3afc1
* commit '0e57d3afc181720bdd6bea3cd1a7352168458b62':
Call aapt2 link with argument-list
Change-Id: Ifa9d900511acec9174e6e658d515b277e9669964
2016-04-28 19:43:46 +00:00
Adam Lesinski
0e57d3afc1
Merge "Call aapt2 link with argument-list" into nyc-dev
2016-04-28 19:34:32 +00:00
Shawn Willden
c8bb30ceef
Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev
...
am: 2c7fd2d1
* commit '2c7fd2d17098653743867be2b02b305b8220ed06':
Describe required format for for PLATFORM_SECURITY_PATCH
Change-Id: Iebd8bc2677347be38f5ce1e66462fdbfbc180ed6
2016-04-28 05:24:17 +00:00
TreeHugger Robot
2c7fd2d170
Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev
2016-04-28 05:07:55 +00:00
Stephen Hines
d325a112b1
Merge "Switch to clang-2812033." am: fb737e9
...
am: e6ca87c
* commit 'e6ca87cc8ced234978bf57b2d6f586858e49207c':
Switch to clang-2812033.
Change-Id: I348a504914a85de12c1b38b5ff4f5616cff04f5e
2016-04-27 22:48:47 +00:00
Stephen Hines
e6ca87cc8c
Merge "Switch to clang-2812033."
...
am: fb737e9
* commit 'fb737e9002f43d68473b68518808aab99da9abcf':
Switch to clang-2812033.
Change-Id: Iffedb14b2c2f2da4d690336f5fa2122dea2e1c83
2016-04-27 22:46:07 +00:00
Stephen Hines
fb737e9002
Merge "Switch to clang-2812033."
2016-04-27 22:33:05 +00:00
Mohamad Ayyash
0d97b0202b
Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev
...
am: b88afd7
* commit 'b88afd7aca281801bf7d6c77462da825759dc4d5':
Rename incr ext4 base_fs path vars. Add to product_var_list.
Change-Id: I61f40e96bb64c03fe4f2633b0dbecda045ff0a4a
2016-04-27 21:25:26 +00:00
Mohamad Ayyash
b88afd7aca
Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev
2016-04-27 21:15:05 +00:00
Yabin Cui
820f42aae3
Merge "Use strip mode mini-debug-info by default except on mips." am: e13b4c6
...
am: 25b78ed
* commit '25b78edecb03b56d8002be3cd78efa3d867e40ed':
Use strip mode mini-debug-info by default except on mips.
Change-Id: I8d71d9579112173ad6d0efedc205d1f7077f27d5
2016-04-27 20:00:09 +00:00
Yabin Cui
25b78edecb
Merge "Use strip mode mini-debug-info by default except on mips."
...
am: e13b4c6
* commit 'e13b4c61bd1d6b0d57d7840607d39cc59fa0d840':
Use strip mode mini-debug-info by default except on mips.
Change-Id: Ia3de2e088b87b71d21b52c358ae5c45564a73bda
2016-04-27 19:22:15 +00:00
Yabin Cui
e13b4c61bd
Merge "Use strip mode mini-debug-info by default except on mips."
2016-04-27 19:19:06 +00:00
Igor Murashkin
40a012a335
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
...
am: 2806d99
* commit '2806d9993811e1b3f6071cb74401f3db8f59913d':
old-cts: Add testng and libcoreoj test support
Change-Id: I19d0dedd42298c75aa93c5baef32eadd312146f2
2016-04-27 18:55:50 +00:00
Ying Wang
b05161e1ec
Merge "Warn if there is file with unknown suffix in Java module\'s sources." am: 85b9117
...
am: 0c1d51d
* commit '0c1d51db71da93a39e548a8b3c38e13f6918d9dd':
Warn if there is file with unknown suffix in Java module's sources.
Change-Id: Ice1362527118749cd1b4da459b04efadf56a560d
2016-04-27 17:03:36 +00:00
Ying Wang
0c1d51db71
Merge "Warn if there is file with unknown suffix in Java module\'s sources."
...
am: 85b9117
* commit '85b911719084b7266de459408e8f038a2a429e0c':
Warn if there is file with unknown suffix in Java module's sources.
Change-Id: I6c7d7a6b51f63f9b6f0da8b6e35d73d46820cae4
2016-04-27 16:59:13 +00:00
Igor Murashkin
5ec15a52b1
old-cts: Add testng and libcoreoj test support
...
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
2016-04-26 17:47:45 -07:00
Yabin Cui
700883eadd
Use strip mode mini-debug-info by default except on mips.
...
Bug: 27923447
Change-Id: I818dea44f126155b4b9b3cd929823d8eda1a1174
2016-04-26 17:39:59 -07:00
Ying Wang
f8d15d6f3f
Warn if there is file with unknown suffix in Java module's sources.
...
This helps catch extra ) at the end of LOCAL_SRC_FILES.
Bug: 28389144
Change-Id: I0ab536b5bb47338ebf5bdf531835d58f527ccf67
2016-04-26 15:59:06 -07:00
Mohammed Habibulla
618c22cf0e
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable" am: a48eb99
...
am: a0bcefa
* commit 'a0bcefa9f06d89bbc5138c69d8be814de47578cb':
ccache: Allow external setting of CCACHE_COMPILERCHECK variable
Change-Id: Ibbbd28a16226be1736449584f5c5c95e7594bbfc
2016-04-26 22:31:14 +00:00
Stefan Stanacar
a0bcefa9f0
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
...
am: a48eb99
* commit 'a48eb99f41c33eb205b3c4e860d82b5d523ba84b':
ccache: Allow external setting of CCACHE_COMPILERCHECK variable
Change-Id: I02bee522220775c5c8e781f1ef2f45a86e2451ba
2016-04-26 22:27:30 +00:00
Mohammed Habibulla
a48eb99f41
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
2016-04-26 22:14:17 +00:00
Stephen Hines
e8b87607c8
Switch to clang-2812033.
...
Bug: http://b/25291096
Change-Id: I630b7e8a682e3c3b82ad9837b664c1155497618f
2016-04-26 14:34:24 -07:00
Adam Lesinski
d4d6a50fbb
Call aapt2 link with argument-list
...
Also follow symbolic links when looking for assets.
Bug:22775504
Change-Id: I78b4e2b7d7750dfecafd64e29cf0e19dff851155
2016-04-26 13:32:01 -07:00
Narayan Kamath
da96f29214
Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev
...
am: 9a611b2
* commit '9a611b27fc86dca60666bc96759f0828ca46e494':
Revert "old-cts: Add testng and libcoreoj test support"
Change-Id: I1da1c77e347f24974809cda6a288b38b8e05fd7a
2016-04-26 13:26:55 +00:00
Narayan Kamath
9a611b27fc
Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev
2016-04-26 13:22:08 +00:00
Narayan Kamath
51b3f1da0b
Revert "old-cts: Add testng and libcoreoj test support"
...
This reverts commit 1d4ad6a527
.
This topic has been reverted because it causes build flakiness and
bogus verification failures on most active changes.
Change-Id: I4a935c9a861e063e28ddc1c35bc3fa015174e81d
2016-04-26 13:14:55 +00:00
Chih-hung Hsieh
cf20458163
Merge "Add tidy.mk to set up global default checks." am: 214c7fa
...
am: 6014381
* commit '60143818969a97ee6827b9de3b56670b0ff774df':
Add tidy.mk to set up global default checks.
Change-Id: I4f678930148ee6a0a3bccce899275af07cc4a738
2016-04-26 01:51:11 +00:00
Chih-Hung Hsieh
6014381896
Merge "Add tidy.mk to set up global default checks."
...
am: 214c7fa
* commit '214c7fadf16b458c0eaa0db1d875ca92b8c0a609':
Add tidy.mk to set up global default checks.
Change-Id: I27a84cab03ff208875014e852f2699d4449d30fd
2016-04-26 01:48:11 +00:00
Igor Murashkin
5dbe905ab9
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
...
am: 1cb8adb
* commit '1cb8adb1faf401443fbb546ade4a445d42d8952d':
old-cts: Add testng and libcoreoj test support
Change-Id: Ib1be2338738d2975ba7215c29304f8633e0632e8
2016-04-25 23:46:44 +00:00
Igor Murashkin
1cb8adb1fa
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
2016-04-25 23:39:16 +00:00
Mohamad Ayyash
1868a601b7
Rename incr ext4 base_fs path vars. Add to product_var_list.
...
BUG: 27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2016-04-25 15:47:42 -07:00
Keun Soo Yim
46a259651f
resolve merge conflicts of 72b82dc
to nyc-dev-plus-aosp
...
Change-Id: I6e62226774584154ad1a802594e386fe7942504b
2016-04-25 15:27:21 -07:00
Keun Soo Yim
3d4847525f
build rule change for VTS (vendor test suite)'s metadata files
...
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
Chih-Hung Hsieh
460171a3e4
Add tidy.mk to set up global default checks.
...
* Default checks include only google* minus google-readability*.
* Some google-* checks are disabled for external projects.
* Each project can add more or disable checks through LOCAL_TIDY_CHECKS.
Bug: http://b/27779618
Change-Id: I83eed73bd2bddaace565a6dde532fb2036b4fac4
2016-04-25 12:17:03 -07:00
Dan Albert
e58300cc30
Merge "Switch mips64 back to NDK r10." am: 9ecf544
...
am: f77eb12
* commit 'f77eb12f02d233cc34e7c0d2c14c0ad737c1d8bb':
Switch mips64 back to NDK r10.
Change-Id: Ia93c84ce3272dfb6cc83e65e1be9e3148bfa161d
2016-04-22 21:32:48 +00:00
Nikola Veljkovic
f77eb12f02
Merge "Switch mips64 back to NDK r10."
...
am: 9ecf544
* commit '9ecf54456c6fc0adc9bc635cfe59a8836eb95a10':
Switch mips64 back to NDK r10.
Change-Id: I0aa5cfb46d446f9b12a9db6ac066ee100a4e9fb3
2016-04-22 21:30:07 +00:00