a0e521ed16
Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9 am: 4727930bff
...
am: 497862c757
2017-11-18 00:53:15 +00:00
497862c757
Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9
...
am: 4727930bff
2017-11-18 00:44:28 +00:00
4727930bff
Merge "releasetools: Fix the rebuilding of vbmeta.img."
...
am: 2f7fab9ab9
2017-11-18 00:32:23 +00:00
2f7fab9ab9
Merge "releasetools: Fix the rebuilding of vbmeta.img."
2017-11-18 00:22:14 +00:00
a80df4238e
Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6 am: 0b1fc880e5
...
am: 99dc51da38
2017-11-17 21:48:22 +00:00
99dc51da38
Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6
...
am: 0b1fc880e5
2017-11-17 21:42:51 +00:00
0b1fc880e5
Merge changes from topics "soong_logtags", "droiddoc_srcjars"
...
am: f1f66974c6
2017-11-17 21:36:51 +00:00
f1f66974c6
Merge changes from topics "soong_logtags", "droiddoc_srcjars"
...
* changes:
Allow converting logtags to java without merged logtags file
Add support for srcjars to droiddoc
2017-11-17 21:32:27 +00:00
ee67994a9b
Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb am: ea43e16f60
...
am: c5e4334bb3
2017-11-17 18:29:41 +00:00
c5e4334bb3
Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb
...
am: ea43e16f60
2017-11-17 18:27:35 +00:00
ea43e16f60
Merge "Tweak comments for OpenJDK 9 build toolchain logic."
...
am: 2655e57bbb
2017-11-17 18:25:32 +00:00
2655e57bbb
Merge "Tweak comments for OpenJDK 9 build toolchain logic."
2017-11-17 18:20:39 +00:00
dfa1a5b3dc
Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1 am: dafe61c817
...
am: c982ae3728
2017-11-17 17:19:07 +00:00
c982ae3728
Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1
...
am: dafe61c817
2017-11-17 17:16:58 +00:00
dafe61c817
Merge "Recognize new clang-tidy android-* warnings."
...
am: 315761ace1
2017-11-17 17:13:27 +00:00
315761ace1
Merge "Recognize new clang-tidy android-* warnings."
2017-11-17 17:07:49 +00:00
7ef760b832
Tweak comments for OpenJDK 9 build toolchain logic.
...
This addresses review comments on the preceding CL
http://r.android.com/539055
Test: Treehugger
Change-Id: Icb0674190db3d638546a0ed49dbcb97d0698e549
2017-11-17 15:35:59 +00:00
2d6a42d182
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." am: 446c9ba370 am: 4ffaa14478
...
am: 24df8fa38f
2017-11-17 15:27:30 +00:00
24df8fa38f
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." am: 446c9ba370
...
am: 4ffaa14478
2017-11-17 15:23:29 +00:00
4ffaa14478
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9."
...
am: 446c9ba370
2017-11-17 15:19:30 +00:00
446c9ba370
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9."
2017-11-17 15:14:40 +00:00
f6bd495728
Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9.
...
This CL topic breaks the single flag value EXPERIMENTAL_USE_OPENJDK9
into two flags USE_OPENJDK9 and TARGET_OPENJDK9 which are computed
independently in config.mk and config.go; this means that later
build logic no longer depends on / duplicates the semantics of an
unset EXPERIMENTAL_USE_OPENJDK9, because that later build logic
can use USE_OPENJDK9 and TARGET_OPENJDK9 instead. Thus, it becomes
slightly easier to change this default in future CLs (touching
only config.mk and config.go).
It also makes it more straightforward to convert .mk files
to .bp.
This CL also introduces a new allowed value "false" for
EXPERIMENTAL_USE_OPENJDK9. This fourth possible value currently
has the same semantics as a default/unset
EXPERIMENTAL_USE_OPENJDK9, but allows people to explicitly
switch back to the old semantics when the default changes.
Test: make showcommands core-oj (in environments with
EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true").
Bug: 38177295
Change-Id: Iaade9610b237722e5d175143808b8653b1e98996
2017-11-17 13:14:11 +00:00
9cdfcc3495
Merge "Rename r8 to r8-compat-proguard" am: 81eeb78200 am: 4eee474504
...
am: fcc1a99442
2017-11-17 03:20:19 +00:00
fcc1a99442
Merge "Rename r8 to r8-compat-proguard" am: 81eeb78200
...
am: 4eee474504
2017-11-17 03:18:14 +00:00
4eee474504
Merge "Rename r8 to r8-compat-proguard"
...
am: 81eeb78200
2017-11-17 03:15:09 +00:00
81eeb78200
Merge "Rename r8 to r8-compat-proguard"
2017-11-17 03:11:29 +00:00
7d6144d34b
Rename r8 to r8-compat-proguard
...
Test: USE_R8=false USE_D8=true m -j32 && USE_R8=true USE_D8=true m -j32
Change-Id: I2610340cf75f8db5920e33fac542f0dcf294ce29
2017-11-16 17:24:01 -08:00
2cd467b36c
Recognize new clang-tidy android-* warnings.
...
Test: warn.py build.log
Change-Id: I9bcd1fffcb567346a3d959f98821e2cf58e87ba2
2017-11-16 15:42:11 -08:00
0bb782bd4e
Allow converting logtags to java without merged logtags file
...
Most logtags files only have entries with hardcoded numbers.
Allow these files to be converted to java without needing the
merged logtags file.
Test: m checkbuild
Change-Id: I4cd38aa502fc9b8e50af92ff8296d3ad6abfb56e
2017-11-16 14:58:05 -08:00
e89df93231
Add support for srcjars to droiddoc
...
Soong generates the R.java for framework-res.apk to a srcjar.
Droiddoc will need to consume them, so add support to the droiddoc
rules for extracting sources from a srcjar.
Test: m checkbuild
Change-Id: I064889c9063b642835d9f668e2568b61d0fabe35
2017-11-16 14:58:05 -08:00
2c24989de7
Merge "Clear some aapt2.mk inputs after use" am: 70964e8024 am: 1684afb6ee
...
am: 507d6d73aa
2017-11-16 04:21:24 +00:00
507d6d73aa
Merge "Clear some aapt2.mk inputs after use" am: 70964e8024
...
am: 1684afb6ee
2017-11-16 04:19:15 +00:00
1684afb6ee
Merge "Clear some aapt2.mk inputs after use"
...
am: 70964e8024
2017-11-16 04:17:10 +00:00
70964e8024
Merge "Clear some aapt2.mk inputs after use"
2017-11-16 04:12:25 +00:00
d927abe8a8
Clear some aapt2.mk inputs after use
...
my_generated_res_dirs wasn't being reset in some cases in between
different modules. To be safe, clear every input variable that I was sure
was not being used by the caller after aapt2.mk.
Test: m
Test: m ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I37c861d99637cad77a2a378a119bf66cee373b3a
2017-11-15 17:00:46 -08:00
ca4224fc7c
Merge "Silence superfluous build messages." am: 4dbdb60698 am: a62800487e
...
am: 463dcf37f8
2017-11-15 22:42:25 +00:00
463dcf37f8
Merge "Silence superfluous build messages." am: 4dbdb60698
...
am: a62800487e
2017-11-15 22:39:21 +00:00
a62800487e
Merge "Silence superfluous build messages."
...
am: 4dbdb60698
2017-11-15 22:35:48 +00:00
4dbdb60698
Merge "Silence superfluous build messages."
2017-11-15 22:27:30 +00:00
d1a6abb4fc
Merge "Silence PRODUCT_COPY_FILES ignored messages" am: 288521a615 am: fe590192de
...
am: c8921864da
2017-11-15 22:05:55 +00:00
c8921864da
Merge "Silence PRODUCT_COPY_FILES ignored messages" am: 288521a615
...
am: fe590192de
2017-11-15 22:02:48 +00:00
fe590192de
Merge "Silence PRODUCT_COPY_FILES ignored messages"
...
am: 288521a615
2017-11-15 21:59:13 +00:00
288521a615
Merge "Silence PRODUCT_COPY_FILES ignored messages"
2017-11-15 21:51:46 +00:00
b0260c26ed
Merge "Enlarge 32bit GSI size setting"
2017-11-15 21:40:15 +00:00
403b98aa25
Silence PRODUCT_COPY_FILES ignored messages
...
We don't have great alternatives for some of these use cases, so for now
just silence them, writing them to $OUT/product_copy_files_ignored.txt
(and if `dist' is specified, $DIST_DIR/logs/product_copy_files_ignored.txt)
Test: lunch aosp_arm-userdebug; m nothing
Test: lunch aosp_arm-userdebug; m dist
Change-Id: If0228bc8d907346e3505ae136cb477ef37a5c867
2017-11-15 11:13:23 -08:00
7cc46f8f40
Merge "releasetools: Fix the size check for AVB images." am: 905c84cada am: 029b3b6619
...
am: 29472b1848
2017-11-15 19:05:07 +00:00
29472b1848
Merge "releasetools: Fix the size check for AVB images." am: 905c84cada
...
am: 029b3b6619
2017-11-15 18:45:40 +00:00
29ec06b7ba
Silence superfluous build messages.
...
Bug: 69315492
Test: it builds
Change-Id: Ic02484b80fa27c53786204402930ed5f33ec7fda
2017-11-15 10:34:01 -08:00
029b3b6619
Merge "releasetools: Fix the size check for AVB images."
...
am: 905c84cada
2017-11-15 18:32:38 +00:00
905c84cada
Merge "releasetools: Fix the size check for AVB images."
2017-11-15 18:15:20 +00:00
Tao Bao