Commit Graph

28537 Commits

Author SHA1 Message Date
Chih-Hung Hsieh 84a2f2ac51 Merge "Recognize more Clang-Tidy google warning patterns." am: 29667bf
am: f6601e6

* commit 'f6601e6f7e1d070189c8f763e1eab2957086c352':
  Recognize more Clang-Tidy google warning patterns.

Change-Id: Ied251994be7f327628d6e43519322afe18a24e02
2016-04-01 16:35:07 +00:00
Chih-Hung Hsieh f6601e6f7e Merge "Recognize more Clang-Tidy google warning patterns."
am: 29667bf

* commit '29667bf9d84ae79b5d2e64f42be00335e36b4653':
  Recognize more Clang-Tidy google warning patterns.

Change-Id: Idcadd39c327e9998d9854baec43eaec680223f9b
2016-04-01 16:30:41 +00:00
Chih-hung Hsieh 29667bf9d8 Merge "Recognize more Clang-Tidy google warning patterns." 2016-04-01 16:15:57 +00:00
Dan Albert 4b5b09a00b Merge "Add LOCAL_NDK_VERSION." am: 4410c29
am: f95ca6d

* commit 'f95ca6de0abb1fe21638c984847e3414038dd4e4':
  Add LOCAL_NDK_VERSION.

Change-Id: Ia2883b5482cef267debb90b2e8923731076c4511
2016-03-31 23:21:45 +00:00
Dan Albert f95ca6de0a Merge "Add LOCAL_NDK_VERSION."
am: 4410c29

* commit '4410c29fd0eb3dd0c03c5a3f7d28deec4f23e96b':
  Add LOCAL_NDK_VERSION.

Change-Id: Ica79c1e5e912a728232aea5b35154e1b5cc28c3f
2016-03-31 23:18:21 +00:00
Chih-Hung Hsieh d742e90fe9 Recognize more Clang-Tidy google warning patterns.
* Many AOSP C/C++ code have google-readability warnings.

Bug: http://b/27779618
Change-Id: Ic7d33b957da5c1062410f48ef18bb68a5aa259e9
2016-03-31 16:14:55 -07:00
Dan Albert 4410c29fd0 Merge "Add LOCAL_NDK_VERSION." 2016-03-31 23:11:26 +00:00
Miao Wang 1c46869386 Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev
am: a529ceb

* commit 'a529cebde857380adec4d14d4779b405666f7599':
  [RenderScript] Update the build rules for x86_64 support lib.

Change-Id: Id7f375df86af08cc9b273d445e1fe9bc97885973
2016-03-31 22:37:29 +00:00
Miao Wang a529cebde8 Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev 2016-03-31 22:25:10 +00:00
Johan Redestig 756e0ea6b7 DO NOT MERGE ANYWHERE - Add libbase to otatools
am: 8d3311f  -s ours

* commit '8d3311f50dd36312918bd94872a856b99db671fa':
  DO NOT MERGE ANYWHERE - Add libbase to otatools

Change-Id: I7f64337eb61321a58d570d9d5932448193d49bf2
2016-03-31 21:33:40 +00:00
Johan Redestig 8d3311f50d DO NOT MERGE ANYWHERE - Add libbase to otatools
build_verity_tree uses libbase since b104044.

Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
2016-03-31 14:20:38 -07:00
Miao Wang 57ef7ea490 [RenderScript] Update the build rules for x86_64 support lib.
Bug: 19735423

  - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
    to search for libm.so and libc.so in lib64/. Otherwise the linker
    will report error.

Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
2016-03-31 14:05:33 -07:00
Dan Albert 13306af0c1 Add LOCAL_NDK_VERSION.
Used to select between releases of the NDK (r10, r11, etc).

Some of the libraries we use in Android come as prebuilts from
google3, which are most likely built against an older NDK than what
we have in the platform. Since things may not be ABI compatible
release to release, we need to keep legacy versions accessible for
those to keep building.

Change-Id: Ia3df42fa6f3a7bd5108ff6bbb0f2ca06239c3be9
2016-03-31 12:54:21 -07:00
Neil Fuller b085b28a53 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev
am: 9109282

* commit '910928284650873748da35fac6f53d6fd25537b1':
  Add core-lambda-stubs to default classpath for target libs compiling using javac

Change-Id: I399cb0698857f0461351506fdc6330d909c8411f
2016-03-31 18:25:04 +00:00
Ying Wang 9109282846 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev 2016-03-31 18:06:27 +00:00
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
Neil Fuller b08544ed7d Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
Change-Id: Ifc79eebabfc6b64c0daf6b9ca236d1967a45a735
2016-03-30 11:01:33 -07: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