Commit Graph

28521 Commits

Author SHA1 Message Date
Ying Wang
81ef4714f4 Merge commit '1f07720f8518236e8438ae0f25ea7211da8c8c45' into manual_merge_1f07720
Change-Id: I5ad50aacbe99b4ebf8ae7e630f169100128b5b3c
2016-03-31 10:10:42 -07:00
Ying Wang
1f07720f85 Merge "Remove support of disabling Jack."
am: 77b6353

* commit '77b63536892a115361e3574474ddcb34ce5cedf0':
  Remove support of disabling Jack.

Change-Id: Ic28400f1a80353ba026ab23e7119b72c4743b196
2016-03-31 16:59:09 +00:00
Ying Wang
b89c5fda00 Merge "Replace in recipe with subshell." am: 0fda1ea
am: d4d59fd

* commit 'd4d59fd87c004a6dbbe581a011f7f9d9027b74a1':
  Replace $(shell) in recipe with subshell.

Change-Id: I67d553aa1ab7f92e7719a3678074aad9d6a812e8
2016-03-31 16:55:55 +00:00
Ying Wang
d4d59fd87c Merge "Replace in recipe with subshell."
am: 0fda1ea

* commit '0fda1eaa43c8d6018e757671a2c92d635e681d93':
  Replace $(shell) in recipe with subshell.

Change-Id: Ia9f2f0a55a2c44cece5af4311383f26d686d456f
2016-03-31 16:52:57 +00:00
Ying Wang
77b6353689 Merge "Remove support of disabling Jack." 2016-03-31 16:52:49 +00:00
Ying Wang
0fda1eaa43 Merge "Replace $(shell) in recipe with subshell." 2016-03-31 16:46:18 +00:00
Sebastien Hertz
62113d22f3 Merge "Rename emma coverage files" into nyc-dev
am: 301d595

* commit '301d5955dabf12b6b0e0610cae5f87231f0dc1f1':
  Rename emma coverage files

Change-Id: Ib728bb5d633fc18cb21ea706142d8a51b813db36
2016-03-31 07:08:08 +00:00
Sebastien Hertz
301d5955da Merge "Rename emma coverage files" into nyc-dev 2016-03-31 06:58:30 +00:00
Philip P. Moltmann
3d25656b2e Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev
am: 8690de4

* commit '8690de4302cb231668def658a1e3b1bfe30eacda':
  Add PrintServiceRecommendationService to the default distro

Change-Id: I3b2a8bf61507ce0eb93deb736078501478765505
2016-03-31 02:10:43 +00:00
Ying Wang
a6a9ab07ed Replace $(shell) in recipe with subshell.
Bug: 27925180
Change-Id: I4a735755e4f818f6ce608c87ad111b9dd205ef41
2016-03-30 18:34:43 -07:00
Philip P. Moltmann
8690de4302 Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev 2016-03-31 01:33:17 +00:00
Andreas Gampe
9b69d2bda7 Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev
am: be97a41

* commit 'be97a415715824562e4ea93efb211b0d5baeb300':
  Build: Switch eng build boot dexopt to verify-at-runtime

Change-Id: I9b0f42aa72fe33fac9f8afee90820bab02b2729b
2016-03-30 23:18:12 +00:00
Andreas Gampe
be97a41571 Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev 2016-03-30 23:05:59 +00:00
Dan Willemsen
0076682f57 Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
am: bbb7b1b  -s ours

* commit 'bbb7b1b62075f1ac34e94a357747ed4692229c14':
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink

Change-Id: I7aaacf47572773503ec1934cfb06c98757e23dc4
2016-03-30 22:26:09 +00:00
Colin Cross
bbb7b1b620 Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink
2016-03-30 22:18:34 +00:00
Dan Willemsen
09a7e88621 Merge "Remove extraneous /" am: 8db170d
am: cb25924

* commit 'cb259241a269d54a9c2a2644cb3c79ce2d307403':
  Remove extraneous /

Change-Id: If026bd7a46bf08a403277cb64e8e1ea4160a20e8
2016-03-30 22:10:40 +00:00
Dan Willemsen
cb259241a2 Merge "Remove extraneous /"
am: 8db170d

* commit '8db170d914a9f0452dd87e66238429df1a5e2e6a':
  Remove extraneous /

Change-Id: I4f92709421baa50ae7adced763ca465f6e805ef9
2016-03-30 21:39:12 +00:00
Dan Willemsen
8db170d914 Merge "Remove extraneous /" 2016-03-30 21:24:08 +00:00
Ying Wang
858657366f Remove support of disabling Jack.
We removed code and variables related to running dx on classes.jar in
this change. Also removed target emma rules (but kept the emma rules for
host java libraries), for it's now done by Jack.
We still support to build classes.jar (and javalib.jar for static Java
libraries) using javac, because tools like javadoc need class files as
input.
Removed the obsolete install-dex-debug.

Bug: 27400061
Change-Id: If0bcdfe62cb181a98754fb0dbe1c12c92e38d3e8
2016-03-30 14:03:12 -07:00
Dan Willemsen
1c4f8e0026 Remove extraneous /
This matches the line we use in Soong, and behaves no differently.

Change-Id: I4487f7f5555edd08dc67a22d547f8218d46ccd8f
2016-03-30 13:36:01 -07:00
Andreas Gampe
8e121663e6 Build: Switch eng build boot dexopt to verify-at-runtime
To have faster turnaround.

Bug: 26794212
Change-Id: I1d7877ec8c9cfff62bf14cbd23a790ee7a0b2734
2016-03-30 12:55:53 -07:00
Dan Willemsen
ae18638b04 Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

 1) Soong generates out.angler/soong/Android.mk
 2) Kati's find generator produces in-memory tree of the filesystem
 3) $(shell ) creates out.angler/Android.mk
 4) The emulated findleaves Android.mk search finds
    out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit cc60f01357)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:57 -07:00
Dan Willemsen
4e2677eaf1 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
(cherry picked from commit d53c0c7b45)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:44 -07:00
Sebastien Hertz
6f8570d36d Merge "Keep emma files for host rules" am: c79c95d
am: 7aec87a

* commit '7aec87ad1e9b7915fdd91fde671aaf5916f68f08':
  Keep emma files for host rules

Change-Id: Iae8e4d51d0f8c6ec61d5444486cd206803d693a0
2016-03-30 19:03:13 +00:00
Chih-Hung Hsieh
2b27844bf9 Merge "Recognize Clang-Tidy warning messages." am: af90d19
am: 0d7da16

* commit '0d7da16751ad591b0c6960750afe8279d9b0fcfb':
  Recognize Clang-Tidy warning messages.

Change-Id: I607e15d55e5cda3b86fed938fb3734a442562660
2016-03-30 19:03:13 +00:00
Sebastien Hertz
7aec87ad1e Merge "Keep emma files for host rules"
am: c79c95d

* commit 'c79c95d3d8035fa9bf93a7005f1094923da43f51':
  Keep emma files for host rules

Change-Id: I0b7679b691242c7877ada6fc78ed058c12c7fbd9
2016-03-30 17:09:17 +00:00
Sebastien Hertz
6ec1f057dc Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.

This CL renames coverage files generated by emma so they no longer
break those created by Jack.

Keep coverage.em file name for host rules where Jack is not called.

Bug: 27822188

(cherry picked from commit 491c9ce48a
&& commit 8f0e52c3a6)

Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
2016-03-30 19:03:34 +02:00
Ying Wang
c79c95d3d8 Merge "Keep emma files for host rules" 2016-03-30 16:56:54 +00:00
Chih-Hung Hsieh
0d7da16751 Merge "Recognize Clang-Tidy warning messages."
am: af90d19

* commit 'af90d199374c52a992c4f4ac7c2a151e1251807f':
  Recognize Clang-Tidy warning messages.

Change-Id: I87a39f0c3f6326a6d0ed356fe2f579dfa12d9cdf
2016-03-30 16:23:25 +00:00
Chih-hung Hsieh
af90d19937 Merge "Recognize Clang-Tidy warning messages." 2016-03-30 16:12:34 +00:00
Sebastien Hertz
8f0e52c3a6 Keep emma files for host rules
Keep coverage.em file name for host rules where Jack is not called.

(Partially reverts change 491c9ce48a)

Bug: 27822188
Change-Id: Ia9344e17ecbecfb9c335608740ab7dc5490c48d5
2016-03-30 09:39:18 +02:00
Dan Willemsen
89ab6f6969 Merge "Darwin: Use the same ar as Soong" am: a223b1c
am: ef75289

* commit 'ef752894ea7f8d176f0cf41fc53014113ee16d8b':
  Darwin: Use the same `ar` as Soong

Change-Id: I04ba9a5cbac3a5a2d539c1984cf1e45ece8516f3
2016-03-30 00:53:19 +00:00
Dan Willemsen
ef752894ea Merge "Darwin: Use the same ar as Soong"
am: a223b1c

* commit 'a223b1cff7e943369364e60656a837f8fb2015dc':
  Darwin: Use the same `ar` as Soong

Change-Id: I177f8a25158dbc2bb93b2c452fe52f7fb350b060
2016-03-30 00:49:50 +00:00
Dan Willemsen
a223b1cff7 Merge "Darwin: Use the same ar as Soong" 2016-03-30 00:38:32 +00:00
Dan Willemsen
6a54a9f10a Darwin: Use the same ar as Soong
Soong uses the copy of `ar` in the OSX SDK instead of the wrapper in
/usr/bin/ar. /usr/bin/ar appears to be a thin wrapper that looks up the
current SDK and passes execution to it. Soong does this so that it can
actually set up a dependency on the tool.

Change-Id: Ia4e4fbe3287539933fa98a1354c3ccee91f4d552
2016-03-29 16:21:32 -07:00
Chih-Hung Hsieh
90d4619f02 Recognize Clang-Tidy warning messages.
* Put all Clang-Tidy warning messages in a group for now.
  There are too many coding style warnings.
* Change the 'top' link to the top of the page.
* Add a few more new clang compiler warnings.

Bug: http://b/27779618
Change-Id: I385b9db927a397704b56f53440301352da8694cf
2016-03-29 15:33:11 -07:00
Ying Wang
6704f7e162 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev
am: 19b8145

* commit '19b81454479b2f6c438593304cd8c8f4c9ca77bc':
  Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt

Change-Id: I4ebd15e849f5dd2c57c4e8679d140f184f999fa1
2016-03-29 21:39:28 +00:00
Ying Wang
19b8145447 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev 2016-03-29 21:31:24 +00:00
Allen Hair
b24ce1b602 Merge "Only add jacocoagent if the package contains some java code." into nyc-dev
am: eda7181

* commit 'eda71810b85677289bee69cb561a52273df34293':
  Only add jacocoagent if the package contains some java code.

Change-Id: I6819cb3187162c91d526bb83b53b76dfe5c437f9
2016-03-29 21:30:10 +00:00
Allen Hair
eda71810b8 Merge "Only add jacocoagent if the package contains some java code." into nyc-dev 2016-03-29 21:18:24 +00:00
Dan Willemsen
a586820428 Merge "Forbid Clang for Windows" am: e4d5e08
am: 1eb2442

* commit '1eb24425d04d64d1811bc34c6395179fa3cfd526':
  Forbid Clang for Windows

Change-Id: I51432b0f6782422dd424edbbecab9a5b936be8f2
2016-03-29 21:02:56 +00:00
Dan Willemsen
1eb24425d0 Merge "Forbid Clang for Windows"
am: e4d5e08

* commit 'e4d5e08c2ec0d9db6b2baa160d4bf847331a331f':
  Forbid Clang for Windows

Change-Id: Idf4637ba20b1744f33b7425384ce1759b87c8fe3
2016-03-29 20:59:52 +00:00
Dan Willemsen
e4d5e08c2e Merge "Forbid Clang for Windows" 2016-03-29 20:54:24 +00:00
Shinichiro Hamaji
fbd5d8de0f Merge "Fix dependencies around tools/*-event-log-tags.py" am: 4487319
am: a2be61e

* commit 'a2be61ed16bcb406030ff01a30e4dec90a8ff5de':
  Fix dependencies around tools/*-event-log-tags.py

Change-Id: I8fee3f7846e723d46eb26356798eedb9566f3a28
2016-03-29 20:51:05 +00:00
Shinichiro Hamaji
a2be61ed16 Merge "Fix dependencies around tools/*-event-log-tags.py"
am: 4487319

* commit '4487319141c9447b8ef88e1d5ac9e8ecea7c619b':
  Fix dependencies around tools/*-event-log-tags.py

Change-Id: I35ce90562fc3ad6b9db20ac85b095debc904746c
2016-03-29 20:48:00 +00:00
Shinichiro Hamaji
4487319141 Merge "Fix dependencies around tools/*-event-log-tags.py" 2016-03-29 20:40:31 +00:00
Ying Wang
6f9bd2a972 Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit e758f9319d we switched from
TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in
add-assets-to-package but forgot to set the variable when we are running
the old aapt.

Bug: 27874886
Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea
2016-03-29 12:41:42 -07:00
Dan Willemsen
9537477df7 Forbid Clang for Windows
Clang and MinGW are not expected to work together currently, and you get
strange errors when this is attempted. Instead, error out with a clear
error message.

Before the windows build rewrite, we'd just explicitly set my_clang to
false without checking what the module asked for. Now, error out if the
module explicitly asked for clang, since by default they'd have it
already if it wasn't for windows. That way when Clang+Windows does
become possible, it can gradually be tested by setting LOCAL_CLANG to
true.

Change-Id: I9e0b0dca30946d94894119443f2fd0593cee1793
2016-03-29 12:34:03 -07:00
Colin Cross
ecc9970127 Remove -d keepdepfile from ninja command line DO NOT MERGE
am: 4aca571

* commit '4aca5715523d1b8a85abde00d7ccc2989c90a96b':
  Remove -d keepdepfile from ninja command line DO NOT MERGE

Change-Id: Ie978a4113e3098b11eb263d326ba31ec7b2275fa
2016-03-29 19:31:40 +00:00
Shinichiro Hamaji
315b592d3a Replace last -includes by .KATI_DEPFILE
am: 0f846c7

* commit '0f846c73e10e9505b0dae61f5ef4c083921cc348':
  Replace last -includes by .KATI_DEPFILE

Change-Id: I66177bf76c2c2b8a9ce84c0303db6099857d92de
2016-03-29 19:31:40 +00:00