Alex Deymo
820bc82bed
Merge changes from topic 'ab_sideload' am: 3750ed3e17
...
am: 93ff77ad1a
Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044
2016-08-10 05:04:23 +00:00
Alex Deymo
93ff77ad1a
Merge changes from topic 'ab_sideload'
...
am: 3750ed3e17
Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05
2016-08-10 05:00:57 +00:00
Alex Deymo
3750ed3e17
Merge changes from topic 'ab_sideload'
...
* changes:
Replace OTA sideload verification key when signing A/B devices.
Install the update-payload-key in the recovery image as well.
2016-08-10 03:55:24 +00:00
Dan Albert
65b899a628
Merge "Account for `LOCAL_NDK_VERSION` when packaging." am: a1374de305
...
am: 43c41aea18
Change-Id: Ib67b829f3989ba353d4031dca89ba90e792a73ca
2016-08-09 01:42:12 +00:00
Dan Albert
43c41aea18
Merge "Account for `LOCAL_NDK_VERSION` when packaging."
...
am: a1374de305
Change-Id: I37d554e931ef125a888ffc2bdf6e6e2f031d89e1
2016-08-09 01:39:43 +00:00
Treehugger Robot
a1374de305
Merge "Account for `LOCAL_NDK_VERSION` when packaging."
2016-08-09 01:36:23 +00:00
Dan Albert
609fa6c0c3
Account for `LOCAL_NDK_VERSION` when packaging.
...
Previously an app built with `LOCAL_NDK_VERSION := r10` would still
be packaged with r11's library.
Test: make checkbuild
Change-Id: I1dcbd65057adaa1af605b9770283f7da994fc3cf
2016-08-08 17:13:31 -07:00
Adam Seaton
76582b95d1
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2
am: 68870731a5
am: f7de14b8a1
...
am: 2d033a9e51
Change-Id: If10e5e34fcd4621c0c7b444f557b7c5c99081007
2016-08-09 00:09:06 +00:00
Adam Seaton
2d033a9e51
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2
am: 68870731a5
...
am: f7de14b8a1
Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
2016-08-09 00:05:36 +00:00
Adam Seaton
f7de14b8a1
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2
...
am: 68870731a5
Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
2016-08-08 23:57:05 +00:00
Adam Seaton
68870731a5
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
...
am: e158db8ad2
Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe
2016-08-08 23:54:05 +00:00
Adam Seaton
e158db8ad2
Update Security String to 2016-09-07 to platform and CTS for September respin
...
am: a53b868e6e
Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
2016-08-08 23:48:10 +00:00
Chih-hung Hsieh
b847aeabd6
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7
...
am: e79eae70f4
Change-Id: I0a9444855d9ec00fba919d9812a373a3f468d23a
2016-08-08 23:40:05 +00:00
Chih-hung Hsieh
e79eae70f4
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
...
am: 4d9d191ee7
Change-Id: I28ec175909e7993f84089846c7c25f516aa1bf02
2016-08-08 23:37:35 +00:00
Chih-hung Hsieh
4d9d191ee7
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
2016-08-08 23:22:13 +00:00
Adam Seaton
a53b868e6e
Update Security String to 2016-09-07 to platform and CTS for September
...
respin
Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00
Chih-Hung Hsieh
fac1926481
Simplify DEFAULT_LOCAL_TIDY_CHECKS.
...
* Now each local directory path is matched against multiple
patterns and only the last matched one will be used,
or the DEFAULT_GLOBAL_TIDY_CHECKS is used.
Bug: http://b/27779618
Change-Id: I786e6cacd8a680a034b4bc09f561f658177d9b17
Test: build with WITH_TIDY=1.
2016-08-08 15:01:59 -07:00
Alex Naidis
d76fa585f2
Merge "core: Makefile: fix a typo in a comment" am: 80ad0df403
...
am: 7fa7758bd3
Change-Id: I08f50d119ae161d762a16b0dd67b7a2741096b56
2016-08-07 16:10:02 +00:00
Alex Naidis
7fa7758bd3
Merge "core: Makefile: fix a typo in a comment"
...
am: 80ad0df403
Change-Id: Id0fce6adadada6d80cca5b08b1e61f0e7a88a01c
2016-08-07 16:06:35 +00:00
Treehugger Robot
80ad0df403
Merge "core: Makefile: fix a typo in a comment"
2016-08-07 16:01:06 +00:00
Alex Naidis
47e24e9fe2
core: Makefile: fix a typo in a comment
...
Change-Id: I1a8f1a4e2d7d29fa930fd0a07f4885c162f3e1f4
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2016-08-07 14:36:50 +00:00
Dan Albert
77233f4fc9
Merge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0
...
am: aede8d4912
Change-Id: I26eec6e4cac0a30cb3184e3b1ea3893715950cae
2016-08-06 01:21:56 +00:00
Dan Albert
aede8d4912
Merge "Define __ANDROID_API__ when building for the NDK."
...
am: 30fe7576d0
Change-Id: I4aa349b7293db5e9e7214cdb10a682164214de60
2016-08-06 01:18:58 +00:00
Treehugger Robot
30fe7576d0
Merge "Define __ANDROID_API__ when building for the NDK."
2016-08-06 00:52:33 +00:00
Dan Albert
754790d0a4
Define __ANDROID_API__ when building for the NDK.
...
Traditionally this has come from android/api-level.h, but with the
libc headers unified it must be set by the build system since we don't
have per-API level copies of that header now.
Test: make checkbuild with other libc ndk_library patches
Change-Id: Idf6cbba131f065b048b1b412e992c55e3d17e701
2016-08-05 16:34:40 -07:00
Dan Albert
c91f6d63f4
Merge "More NDK generated libs support." am: bd9fb4ba01
...
am: db4c597d5f
Change-Id: Icaef258ae8c69609845a2347d6963d09275a1a45
2016-08-05 22:38:18 +00:00
Chih-hung Hsieh
aefdd322de
Merge "Make it an error when LOCAL_CLANG is false." am: 9204b776bb
...
am: f329021c0f
Change-Id: Ie0ea0c0ce8125724cf5c0b4fcf8ec2147d7777e9
2016-08-05 22:38:18 +00:00
Dan Albert
db4c597d5f
Merge "More NDK generated libs support."
...
am: bd9fb4ba01
Change-Id: I46e77781702a68bea56691245e04387fc2845b56
2016-08-05 22:35:11 +00:00
Chih-Hung Hsieh
f329021c0f
Merge "Make it an error when LOCAL_CLANG is false."
...
am: 9204b776bb
Change-Id: I7e2e674eb6f79ec7180f801dd12378842b239512
2016-08-05 22:35:10 +00:00
Treehugger Robot
bd9fb4ba01
Merge "More NDK generated libs support."
2016-08-05 22:32:13 +00:00
Chih-hung Hsieh
9204b776bb
Merge "Make it an error when LOCAL_CLANG is false."
2016-08-05 22:25:43 +00:00
Chih-Hung Hsieh
2ee4c1abbf
Make it an error when LOCAL_CLANG is false.
...
Only projects in LOCAL_CLANG_EXCEPTION_PROJECTS can set LOCAL_CLANG to false.
Add external/gentoo/integration to this white list.
Bug: 30575506
Change-Id: Icd508686bc2eb8b9d400200166df80115af20da1
Test: build and find new warning in build.log
2016-08-05 11:21:20 -07:00
Alex Deymo
b3e8ce6d1d
Replace OTA sideload verification key when signing A/B devices.
...
The update-payload-key is used by update_engine_sideload from recovery
to verify an update payload.
Bug: 27178350
Change-Id: I7a0a307ae565e5e9cbf2c9b58fbcc055e87771ce
2016-08-04 16:06:12 -07:00
Dan Albert
c1ca19007f
More NDK generated libs support.
...
Any NDK shared libraries not in LOCAL_SYSTEM_SHARED_LIBRARIES weren't
being pulled from the generated libs before since we were only
filtering my_system_shared_libraries and even if we had filtered
my_shared_libraries they would have been rewritten to my_ldlibs.
* Filter my_shared_libraries for NDK generated libs as well.
* Stop rewriting NDK LOCAL_SHARED_LIBRARIES to my_ldlibs. Instead,
rewrite in the opposite direction just like we do for the platform.
* Move shared libs/ldlibs rewriting to before we filter NDK
libraries out of shared libs/system shared libs.
Test: make checkbuild
Bug: http://b/27533932
Change-Id: If1860d9638de77089a46884f406766edaf362216
2016-08-04 15:22:11 -07:00
Alex Deymo
c6ebe9fcd7
Install the update-payload-key in the recovery image as well.
...
The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.
Bug: 27178350
TEST=`make` builds a boot.img with the payload key in recovery.
Change-Id: I04616979023b84aa4a1feb6916db2b2725b25c54
2016-08-03 20:52:54 -07:00
Joe Fernandez
1b3b0f532f
docs: Add TOC template logic for ARC docs am: accb6660a5
...
am: 9d606e0082
Change-Id: Ie73c8f38a93bd7658264ae7811a3c77792fe3632
2016-08-04 00:54:40 +00:00
Joe Fernandez
9d606e0082
docs: Add TOC template logic for ARC docs
...
am: accb6660a5
Change-Id: I58282b1958be93e2247f873a9e8b13d0e192b56a
2016-08-04 00:51:04 +00:00
Joe Fernandez
accb6660a5
docs: Add TOC template logic for ARC docs
...
b/30114799
Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
(cherry picked from commit 99aacfe834
)
2016-08-03 23:18:00 +00:00
Chih-Hung Hsieh
cdebde5717
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS." am: 6b5e8f0037
...
am: 90617b5946
Change-Id: Ibca19680de7dafc211c20aae6f485a82cbe321b2
2016-08-03 20:26:46 +00:00
Chih-Hung Hsieh
90617b5946
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
...
am: 6b5e8f0037
Change-Id: I0b2e7ca9d6aa1feeb5c4edadc565e0bca292625d
2016-08-03 20:24:22 +00:00
Treehugger Robot
6b5e8f0037
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
2016-08-03 20:04:20 +00:00
Chih-Hung Hsieh
476658cc31
Merge "Allow some bionic tests to compile with gcc." am: 85e94f076c
...
am: 00ec6d81fd
Change-Id: I1392a559ac1d035e293239cfa3c49e22f5cead40
2016-08-03 19:04:40 +00:00
Chih-Hung Hsieh
00ec6d81fd
Merge "Allow some bionic tests to compile with gcc."
...
am: 85e94f076c
Change-Id: Ic272be5c1ac460d5bda8373b8790829b43ef8257
2016-08-03 19:02:16 +00:00
Chih-Hung Hsieh
3ea1e51ebe
Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS.
...
* INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk.
Bug: 30575506
Test: build and find new warning in build.log
Change-Id: If5341a856d1792add38c80a15b8deae39f156138
2016-08-03 11:57:30 -07:00
Treehugger Robot
85e94f076c
Merge "Allow some bionic tests to compile with gcc."
2016-08-03 18:55:16 +00:00
Chih-Hung Hsieh
82c78c5445
Allow some bionic tests to compile with gcc.
...
bionic/tests has some test cases compiled with both gcc and clang.
Bug: 30575506
Change-Id: I68576a931021089ecc6b9c9d14ef0b3e3cf05e2d
Test: build and find new warning in build.log
2016-08-03 10:42:10 -07:00
Chih-hung Hsieh
f7de7370ac
Merge "Issue warning on projects with LOCAL_CLANG set to false." am: e71cdfbdee
...
am: f43279a359
Change-Id: I0d42d2f4fcc87303064ad4b7026f46573eb31efe
2016-08-03 16:53:20 +00:00
Chih-Hung Hsieh
f43279a359
Merge "Issue warning on projects with LOCAL_CLANG set to false."
...
am: e71cdfbdee
Change-Id: Icb5708eb58f3c8e54b60538377b6afba5eb04de5
2016-08-03 16:50:52 +00:00
Chih-hung Hsieh
e71cdfbdee
Merge "Issue warning on projects with LOCAL_CLANG set to false."
2016-08-03 16:42:27 +00:00
Chih-Hung Hsieh
d9cd1fafb5
Issue warning on projects with LOCAL_CLANG set to false.
...
* LOCAL_CLANG_EXCEPTION_PROJECTS is the list of project prefixes.
* New warning message is detected by warn.py as high severity.
Bug: 30575506
Change-Id: I87a38b2ba6bab1d2e5e7a9d5ec9557f0e609727c
Test: build and find new warning in build.log
2016-08-02 16:10:49 -07:00