Commit graph

39393 commits

Author SHA1 Message Date
Ryan Campbell
84a873dd50 Merge "Use space-separated coverage paths."
am: f7a596a161

Change-Id: I8dce3520428550e9c1591b6d4fbd7733429c5a78
2017-10-23 23:44:44 +00:00
Treehugger Robot
f7a596a161 Merge "Use space-separated coverage paths." 2017-10-23 23:38:49 +00:00
Tao Bao
a89179ad7c Merge "Fix an issue in assert-max-image-size."
am: d690ca5b8a

Change-Id: Ic60bb93a2daec5164caf584e3988240c2c5d70cc
2017-10-23 22:52:58 +00:00
Tao Bao
d690ca5b8a Merge "Fix an issue in assert-max-image-size." 2017-10-23 22:43:23 +00:00
Torne (Richard Coles)
129ab63392 resolve merge conflicts of 0c8b471be3 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I81ec8e0660100eabdc0664cfc37198e95be95ae2
2017-10-23 11:41:58 -04:00
Treehugger Robot
0c8b471be3 Merge "Don't add empty entry to PATH." 2017-10-23 15:02:24 +00:00
Jiyong Park
5099d1a340 Merge "Freeze VNDK lib list on release platforms"
am: f636d065bd

Change-Id: I926ed105da6627f03d614a1d8196c35bdc378eaf
2017-10-23 02:05:14 +00:00
Treehugger Robot
f636d065bd Merge "Freeze VNDK lib list on release platforms" 2017-10-23 02:01:06 +00:00
Ryan Campbell
a435aa5171 Use space-separated coverage paths.
Specify paths to instrument with coverage using space separated lists
instead of comma separated. This makes it easier to specify the lists in
a typical format in the device mk.

Test: add COVERAGE_PATHS to device-sailfish.mk, make -j60
Bug: 67998360
Change-Id: I26c67127d72bd7a153eb4a2c23eae4881a813d54
2017-10-22 19:10:09 +00:00
Jiyong Park
3b6c916194 Freeze VNDK lib list on release platforms
The list of VNDK libraries that exist in the source tree is compared
against the latest known list. If they are different, build breaks.

The latest list can be updated by running update-vndk-list.sh but it
is allowed only for development branches (i.e. PLATFORM_VERSION_CODENAME
!= REL).

Bug: 67002788
Test: build 2017 pixel devices
Test: m check-vndk-list
Test: update-vndk-list.sh
Change-Id: I4bae2b647c045b11ac7d587fab48067bf53a7cf4
2017-10-22 18:05:44 +09:00
Nan Zhang
117151358c Merge "Remove Turbine definition from config.mk"
am: a6d7420c58

Change-Id: If37be35711fbb8e2c728915c23c54d86f41fa83a
2017-10-21 01:28:46 +00:00
Treehugger Robot
a6d7420c58 Merge "Remove Turbine definition from config.mk" 2017-10-21 01:20:45 +00:00
Colin Cross
bce301801f Merge "Update references to build/core to build/make/core"
am: 6db8597174

Change-Id: I4be5bc1805d1900991966d24fda15f2705ee248d
2017-10-20 23:49:17 +00:00
Colin Cross
6db8597174 Merge "Update references to build/core to build/make/core" 2017-10-20 23:41:12 +00:00
Colin Cross
00550036f8 Merge "Add dependencies on classes.jar for soong modules"
am: 8bef6515da

Change-Id: I578d276269a9fe03ef1d54ce799a0f7648acadce
2017-10-20 23:10:40 +00:00
Colin Cross
8bef6515da Merge "Add dependencies on classes.jar for soong modules" 2017-10-20 23:02:36 +00:00
Colin Cross
6cdc5d20f3 Update references to build/core to build/make/core
sed -i -e 's"\([^/]\)build/core"\1build/make/core"g' $(git grep -l build/core)

Test: m checkbuild
Change-Id: Idf3a2fed79aee5d2c07bd8e42f0c0660f253ddc2
2017-10-20 12:49:28 -07:00
Alan Leung
70e5a23d9e Merge "Remove D8 make variables."
am: 3c8949e342

Change-Id: I9ad7a96b4b317c85a68f62f9812337bb109ddbfa
2017-10-20 19:05:04 +00:00
Alan Leung
3c8949e342 Merge "Remove D8 make variables." 2017-10-20 18:59:22 +00:00
Colin Cross
460205568f Add dependencies on classes.jar for soong modules
Make javalib.jar files copied from soong modules depend on the copied
classes.jar files.

Test: rm classes.jar && m modulename && ls classes.jar
Test: rm classes.jar && m javalib.jar && ls classes.jar
Change-Id: I5ab77960a43b07c214969834cb3472ed121c8828
2017-10-20 11:36:13 -07:00
Yabin Cui
7b0836d41d Merge "Link tsan shared library when tsan is used."
am: c29a1160c5

Change-Id: I30ed3425a2a1f1a2b9831ecb612cccabc03116a1
2017-10-20 18:04:29 +00:00
Yabin Cui
c29a1160c5 Merge "Link tsan shared library when tsan is used." 2017-10-20 17:56:00 +00:00
Tao Bao
f55aae7211 Merge "releasetools: Work around the issue with mke2fs created images."
am: d526e0c8e9

Change-Id: I9d4d034ad3f2763ac3da6a22bf0bd0dc02eb98c3
2017-10-20 17:31:12 +00:00
Tao Bao
d526e0c8e9 Merge "releasetools: Work around the issue with mke2fs created images." 2017-10-20 17:24:36 +00:00
Nan Zhang
9438dbea25 Remove Turbine definition from config.mk
Test: m clean && m -j

Change-Id: I5444301864c2e4f08eb525c286994898f5ec2494
2017-10-19 23:05:45 -07:00
Andreas Gampe
3149e9b4b7 Merge "Build: Move preopt classpath to private variable"
am: 57048cd455

Change-Id: I4db3b8594e32761b10e9b9f489c48caa6e73a270
2017-10-20 00:24:11 +00:00
Treehugger Robot
57048cd455 Merge "Build: Move preopt classpath to private variable" 2017-10-20 00:01:20 +00:00
Tao Bao
b937ead5d9 releasetools: Work around the issue with mke2fs created images.
When generating block based OTAs, we read files from the sparse image
directly with the help of block map file. However, the block map info
might not be accurate if the image is created with mke2fs. Because
mke2fs may skip allocating actual blocks if they contain all zeros.
ota_from_target_files.py consequently passes incomplete APK files to
imgdiff, which fails to generate patches.

This CL works around the issue by falling back from imgdiff to bsdiff on
failures. We should figure out a better way in b/68016761 to remove the
workaround, which would otherwise hide other issues in imgdiff.

Bug: 67824829
Bug: 68016761
Test: ota_from_target_files.py passes on previously failing TF zips.
Change-Id: Ib24c5b5f89812b97a0c87c6bf0dc147ae39bc92f
2017-10-19 16:56:22 -07:00
Alan Leung
3c736b9315 Remove D8 make variables.
Bug: 67754178
Test: m -j32 checkbuild && USE_D8=true m -j32 checkbuild

Change-Id: I474e57365a8b2c5ff82b5774cb38e6846454f854
2017-10-19 16:24:05 -07:00
Jeff Gaston
32668a2252 Merge "Slightly easier debugging of missing inputs to copy-file-to-target"
am: 1cba05bb39

Change-Id: I57ba43f79d5fc3e9baf73e119bb9881d3ccd0f68
2017-10-19 22:56:30 +00:00
Treehugger Robot
1cba05bb39 Merge "Slightly easier debugging of missing inputs to copy-file-to-target" 2017-10-19 22:52:20 +00:00
Jeff Gaston
d58fb067a5 Merge "Support 'tapas help' for more-detailed tapas help"
am: 4f7fd556ae

Change-Id: I040a51338678883e42361bfdfd147554e77ba094
2017-10-19 22:20:10 +00:00
Treehugger Robot
4f7fd556ae Merge "Support 'tapas help' for more-detailed tapas help" 2017-10-19 22:12:05 +00:00
Yabin Cui
e77c32ea97 Link tsan shared library when tsan is used.
Bug: http://b/25392375
Test: build a unit test with tsan.
Change-Id: Ib2d937f2e311f6670cf341a983740f0ca464f166
2017-10-19 14:33:58 -07:00
Bowgo Tsai
2b83ca7481 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk"
am: 96929d691e

Change-Id: I0a208412fe98cbd06b24bfba24f5f08edb95bb52
2017-10-19 01:56:00 +00:00
Treehugger Robot
96929d691e Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" 2017-10-19 01:42:55 +00:00
Tom Cherry
8b182afa9b Merge "Don't truncate ${USER} when generating ro.build.fingerprint"
am: 8543feae1d

Change-Id: Id5afb5ee4a11034ab8ae03f1d386c7f7c68c5bb0
2017-10-18 23:24:19 +00:00
Tom Cherry
8543feae1d Merge "Don't truncate ${USER} when generating ro.build.fingerprint" 2017-10-18 23:15:38 +00:00
Tao Bao
9c531a9bef Merge "releasetools: Remove the workarounds for mkyaffs2image."
am: d2a09ef2d1

Change-Id: I7f975b9d734f3bc9594758a365574a9ce009d19c
2017-10-18 22:04:12 +00:00
Tao Bao
d2a09ef2d1 Merge "releasetools: Remove the workarounds for mkyaffs2image." 2017-10-18 22:00:27 +00:00
Tom Cherry
a4af66e8cb Don't truncate ${USER} when generating ro.build.fingerprint
We have removed the 92 character limit on ro.build.fingerprint, so
there is no longer a reason to truncate ${USER} when generating
fingerprints.

Bug: 34954705
Test: boot bullhead and observe non-truncated username
Change-Id: If79bf1d5372f709c9c1725f860bc61b99e830751
2017-10-18 14:17:47 -07:00
Mathieu Chartier
d5e2cc0081 Merge "Add product property for preopting extracted APKs"
am: 4856596dc6

Change-Id: I60ab3d2cae7fbdcbd70cc90a8adc46af260b3e9b
2017-10-18 18:09:03 +00:00
Tao Bao
300506e147 Merge "Build repeatable system images with mke2fs."
am: 404af2ca4b

Change-Id: I49a97fe49449b1e2466eb8cd612816c526da0bcb
2017-10-18 18:05:46 +00:00
Mathieu Chartier
4856596dc6 Merge "Add product property for preopting extracted APKs" 2017-10-18 17:22:11 +00:00
Tao Bao
fa863c86b7 releasetools: Remove the workarounds for mkyaffs2image.
Test: `m dist` on Linux and macOS.
Test: Use an existing target_files.zip for bullhead. Remove IMAGES/*
      and rebuild the images with 'add_img_to_target_files.py -a'. It
      generates idential images as in the original TF.zip.
Change-Id: I803656bf2c924dce53f2271dcb967a94fff48440
2017-10-18 10:21:33 -07:00
Treehugger Robot
404af2ca4b Merge "Build repeatable system images with mke2fs." 2017-10-18 17:20:00 +00:00
Colin Cross
94ddb28a26 Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix"
am: f4f94ab567

Change-Id: I9c978fb748ec3ce15cc9ea238193606a4726ae8f
2017-10-18 10:51:53 +00:00
Treehugger Robot
f4f94ab567 Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" 2017-10-18 09:41:11 +00:00
Zach Riggle
42ba61ca7c Merge "Add strace back onto userdebug builds"
am: e02a37d046

Change-Id: I5930dee81f990c534e1553f5cbcff83afdfcd984
2017-10-18 06:00:39 +00:00
Treehugger Robot
e02a37d046 Merge "Add strace back onto userdebug builds" 2017-10-18 05:56:17 +00:00