Commit graph

14585 commits

Author SHA1 Message Date
Alan Leung
1a7b3f5531 Merge "Enable D8 by default." am: a867dfa71c am: d46624b4d8 am: 209e7bf321
am: 9bf2c705d3

Change-Id: I1a49ba46919f9827c73e601d2bbab05dd6b707c0
2017-10-09 21:06:03 +00:00
Alan Leung
9bf2c705d3 Merge "Enable D8 by default." am: a867dfa71c am: d46624b4d8
am: 209e7bf321

Change-Id: Ie15ea435e30075aa572c508431ec214b6ec3f0e0
2017-10-09 20:50:42 +00:00
Alan Leung
209e7bf321 Merge "Enable D8 by default." am: a867dfa71c
am: d46624b4d8

Change-Id: I242938251d268f0122cb9b03a3be0c8fe3d60567
2017-10-09 20:26:33 +00:00
Alan Leung
d46624b4d8 Merge "Enable D8 by default."
am: a867dfa71c

Change-Id: I0e68a345fb18cb52033480678eca6979bcb94f5e
2017-10-09 20:18:15 +00:00
Alan Leung
4c1a09823c Enable D8 by default.
Bug: 67569208
Test: m -j32

Change-Id: Ie80ce7ca0e6955ef6c1fbae1fa5b169374068cf4
2017-10-09 07:41:35 +00:00
Colin Cross
422d4afa8f Merge changes I06b8efa8,Id2fa2d18 am: 4d44c2dc12 am: 6fff4ee8de am: a88ca0936f
am: 4442e1180f

Change-Id: I62bbed59b3b86e885d21bfb490ef098e8e6d6935
2017-10-06 23:43:32 +00:00
Colin Cross
4442e1180f Merge changes I06b8efa8,Id2fa2d18 am: 4d44c2dc12 am: 6fff4ee8de
am: a88ca0936f

Change-Id: I0e21e38f2135bb4fbb17ae3a44d84a769e685cbf
2017-10-06 23:38:07 +00:00
Colin Cross
a88ca0936f Merge changes I06b8efa8,Id2fa2d18 am: 4d44c2dc12
am: 6fff4ee8de

Change-Id: I9b520a2c63dbffb654e144668c5936c07b649013
2017-10-06 23:34:04 +00:00
Colin Cross
6fff4ee8de Merge changes I06b8efa8,Id2fa2d18
am: 4d44c2dc12

Change-Id: Ib605f3b7e1df80bb85f6894f39e6caf54aaaa514
2017-10-06 23:28:42 +00:00
Colin Cross
f229de4a4b Enable dexpreopt and dex stripping in soong jars
Dexpreopt jars from soong, which also strips classes.dex from
javalib.jar.

Test: m -j checkbuild
Test: unzip -l $OUT/system/framework/core-oj.jar
Change-Id: I06b8efa8993f6c44f0ad8c988e57a3cba08e17ad
2017-10-06 14:36:38 -07:00
Colin Cross
ea1629e788 Refactor removing classes.dex for dexpreopt
Combining $(call dexpreopt-remove-classes.dex) into a
$(call copy-one-file) rule is hacky and error prone.  Make a helper
dexpreopt-copy-jar function that takes LOCAL_DEX_PREOPT and copies
the jar, removing the dex files if necessary.

Test: only description message changes to out/build-${TARGET_PRODUCT}.ninja
Change-Id: Id2fa2d18571ca01bc81302c912b8de25f3dde7a1
2017-10-06 14:26:25 -07:00
Tobias Thierer
4e81da6711 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d17 am: 719728f67d am: 55aa54fd22
am: 4840d2bcb9

Change-Id: I1f84d220198a69fbc0baa69da67d68b31b57acc8
2017-10-06 20:26:26 +00:00
Tobias Thierer
4840d2bcb9 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d17 am: 719728f67d
am: 55aa54fd22

Change-Id: I7a165a3857aa32acf9930383ac39a6ced19a8174
2017-10-06 20:07:16 +00:00
Tobias Thierer
55aa54fd22 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d17
am: 719728f67d

Change-Id: I3c1b93a2204d3b14c69afb4e7e051fecedd2e1ee
2017-10-06 20:03:04 +00:00
Jiyong Park
ec5aacff60 Merge "Don't reserve size for bad blocks when checking image size" am: dd68a6cb74
am: bc8a222efe

Change-Id: Ia06ceb9fc418f265bff2aaf05aaf2625023e3698
2017-10-06 20:02:17 +00:00
Tobias Thierer
719728f67d Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26."
am: c6465f5d17

Change-Id: I52fec751f0dcd729f1903c4e70a6bbef8873488b
2017-10-06 19:58:34 +00:00
Jiyong Park
bc8a222efe Merge "Don't reserve size for bad blocks when checking image size"
am: dd68a6cb74

Change-Id: Ibea8f1f19b6ec4a3cf1969dde726a90265439128
2017-10-06 19:55:45 +00:00
Tobias Thierer
c6465f5d17 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." 2017-10-06 19:42:57 +00:00
Treehugger Robot
dd68a6cb74 Merge "Don't reserve size for bad blocks when checking image size" 2017-10-06 19:40:29 +00:00
Tobias Thierer
745c6a55d3 Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26.
The default LOCAL_JAVA_LANGUAGE_VERSION is normally 1.8, or 1.9
when EXPERIMENTAL_USE_OPENJDK9 is explicitly set to the
nondefault value of "true".

Since old Android API levels do not support later versions,
LOCAL_JAVA_LANGUAGE_VERSIONs is already capped at 1.7 for
APIs <= 23.

This CL further caps it at 1.8 for all released APIs (currently
<= 26) even when EXPERIMENTAL_USE_OPENJDK9=true.
This may need to be updated in future.

This CL only affects builds where EXPERIMENTAL_USE_OPENJDK9 is
set; it does not affect the default build.

Bug: 67454477
Test: Treehugger

Change-Id: I54ca72bdb09aeb4184d5bb3c51d881dcfc943839
2017-10-06 15:57:33 +01:00
Colin Cross
3ed53bd5b5 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" am: 0c0e2b0779 am: ed36337b02 am: 53573b6638
am: 6410435178

Change-Id: I7df07e6d6211a53b816a99cc974840c96dada630
2017-10-06 04:55:09 +00:00
Colin Cross
6410435178 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" am: 0c0e2b0779 am: ed36337b02
am: 53573b6638

Change-Id: I48770f00e2c45b509f891cb3d8bf1368e62edd0b
2017-10-06 04:51:34 +00:00
Colin Cross
53573b6638 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" am: 0c0e2b0779
am: ed36337b02

Change-Id: Id5bbcd7ba648d4b5685cb07f7830fc3f44989e45
2017-10-06 04:46:01 +00:00
Colin Cross
ed36337b02 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set"
am: 0c0e2b0779

Change-Id: I58ebe843ce27d8de580179a4a296662f31486d31
2017-10-06 04:41:28 +00:00
Treehugger Robot
0c0e2b0779 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" 2017-10-06 04:34:52 +00:00
Dan Willemsen
e0382d835a Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" am: 4ec7972785 am: 62263d99ef am: 8e025e030f
am: 1d4993cdee

Change-Id: Id6ccfdd2b662c4908e90b337ce47d4a2e762b34e
2017-10-06 00:18:10 +00:00
Dan Willemsen
1d4993cdee Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" am: 4ec7972785 am: 62263d99ef
am: 8e025e030f

Change-Id: I1f83f8477f353d0c5f0a6fb2e329d50835b377a9
2017-10-06 00:14:35 +00:00
Dan Willemsen
8e025e030f Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" am: 4ec7972785
am: 62263d99ef

Change-Id: If92646026edb96ebd47efd647cba4c9718e67e1c
2017-10-06 00:12:33 +00:00
Dan Willemsen
62263d99ef Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts"
am: 4ec7972785

Change-Id: I9d0dd30884e50299ef0df5b3761ed906ad3b6598
2017-10-06 00:10:22 +00:00
Colin Cross
d7b99409ce Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set
Bug: 62123342
Test: m -j EXPRIMENTAL_USE_OPENJDK9=1.8 checkbuild
Change-Id: I8be331c422412d6416d92184a2eba093f27fc0fb
2017-10-05 16:47:54 -07:00
TreeHugger Robot
2224b84cd3 Merge "Don't reserve size for bad blocks when checking image size" into oc-mr1-dev-plus-aosp 2017-10-05 22:18:25 +00:00
Dan Willemsen
e3c99016f9 Always pass --auto-add-overlay to aapt2 for aar prebuilts
Bug: 64723465
Test: Build all aar prebuilts in our internal tree
Change-Id: I82ef8d59d4f710b755226b2801dc65c2ccffe40c
2017-10-05 14:55:11 -07:00
Alan Leung
a1c4fe7320 Merge "Add USE_D8_BY_DEFAULT in makefile." am: 03e8fb10d1 am: 5f1417897c am: e6bf28ffe7
am: a42c3b554f

Change-Id: I4642642c4fcbd8a2cc80a2ce4b883dd8051fcf54
2017-10-05 09:35:45 +00:00
Alan Leung
a42c3b554f Merge "Add USE_D8_BY_DEFAULT in makefile." am: 03e8fb10d1 am: 5f1417897c
am: e6bf28ffe7

Change-Id: I26965f59880539274abbefa22a9a583b393e4064
2017-10-05 09:29:59 +00:00
Alan Leung
e6bf28ffe7 Merge "Add USE_D8_BY_DEFAULT in makefile." am: 03e8fb10d1
am: 5f1417897c

Change-Id: Ia9caff515e5f09cf7bd7a178e46410199f8f0d71
2017-10-05 09:24:12 +00:00
Alan Leung
5f1417897c Merge "Add USE_D8_BY_DEFAULT in makefile."
am: 03e8fb10d1

Change-Id: I68ba9afe7406fe84ddb9b5d18e583b89d0b8ccd8
2017-10-05 09:20:21 +00:00
Jiyong Park
4b61a94f70 Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Merged-In: I954bf261441b53844e75d05788866f1692a2ad43
Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-05 09:32:01 +09:00
Jiyong Park
1b9b73d846 Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-04 21:42:11 +09:00
Jiyong Park
03eb06150b Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Merged-In: I954bf261441b53844e75d05788866f1692a2ad43
Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-04 21:25:08 +09:00
Colin Cross
f082e5ef07 Merge "Revert "Generate the NDK docs with the ndk-docs target."" am: b33250278b am: 9f92348ffa am: b2692a768a
am: a9967cb1f4

Change-Id: Ifad5b19f9f847e2426944ec5b17ca91f20be927b
2017-10-04 00:49:15 +00:00
Colin Cross
a9967cb1f4 Merge "Revert "Generate the NDK docs with the ndk-docs target."" am: b33250278b am: 9f92348ffa
am: b2692a768a

Change-Id: Ice5624e4479367acfe26a02b43d66a981f2a23fc
2017-10-04 00:38:18 +00:00
Colin Cross
b2692a768a Merge "Revert "Generate the NDK docs with the ndk-docs target."" am: b33250278b
am: 9f92348ffa

Change-Id: Ibe6de1d4f40d6932219ef458b56bf8d92e62fe87
2017-10-04 00:27:46 +00:00
Colin Cross
9f92348ffa Merge "Revert "Generate the NDK docs with the ndk-docs target.""
am: b33250278b

Change-Id: I96b3d752fd0ad9b2deb438fbdd677a17619e0540
2017-10-04 00:21:57 +00:00
Alan Leung
013a37b760 Add USE_D8_BY_DEFAULT in makefile.
Bug: 65854021
Test: m USE_D8=true  showcommands out/target/common/obj/JAVA_LIBRARIES/okhttp_intermediates/with-local/classes.dex
Change-Id: Iec1a05bf6f03cf856faf2e013fa169e1a0beaf7a
2017-10-03 17:15:01 -07:00
Colin Cross
b33250278b Merge "Revert "Generate the NDK docs with the ndk-docs target."" 2017-10-04 00:13:54 +00:00
Colin Cross
c294f55489 Revert "Generate the NDK docs with the ndk-docs target."
This reverts commit d51b6d0d75.

Reason for revert: Broke all unbundled builds

Change-Id: Id6722a076ee91ca150b1a53935632579c6f6f6dd
2017-10-04 00:13:00 +00:00
Dan Albert
19824da029 Merge "Generate the NDK docs with the ndk-docs target." am: 0f47dd4c13 am: e0af1859b8 am: 68392e230e
am: a7ac97d232

Change-Id: I238ff9afcc5812094af87e12f375ab259804e757
2017-10-03 23:05:12 +00:00
Dan Albert
a7ac97d232 Merge "Generate the NDK docs with the ndk-docs target." am: 0f47dd4c13 am: e0af1859b8
am: 68392e230e

Change-Id: Ifcbe44b36a3f21281fd6f02355d14cb1c0e17310
2017-10-03 22:50:20 +00:00
Dan Albert
68392e230e Merge "Generate the NDK docs with the ndk-docs target." am: 0f47dd4c13
am: e0af1859b8

Change-Id: Id314d6248152d865d0bd7fdeb779a8fb930fd052
2017-10-03 22:42:58 +00:00
Dan Albert
e0af1859b8 Merge "Generate the NDK docs with the ndk-docs target."
am: 0f47dd4c13

Change-Id: I8631da79f3ba45b46be7d0d50fdb48a0b623d141
2017-10-03 22:39:00 +00:00