Dan Albert
fd953aec6e
Merge "Update NDK libc++ header paths." am: 66dcc50
...
am: 5514b26
* commit '5514b26d26e759e12557efbf10fe69acfbf5114c':
Update NDK libc++ header paths.
Change-Id: I9153be2e981b4bda778a9ea74cc867435c68c6d9
2016-04-04 20:38:11 +00:00
Dan Albert
5514b26d26
Merge "Update NDK libc++ header paths."
...
am: 66dcc50
* commit '66dcc50c71cd6bc198e8e411ea902405bc48fabe':
Update NDK libc++ header paths.
Change-Id: I6cb300e1ba26485ca0af9625127de3229a4c7882
2016-04-04 20:35:41 +00:00
Dan Albert
66dcc50c71
Merge "Update NDK libc++ header paths."
2016-04-04 20:27:42 +00:00
Mohamad Ayyash
75b2801963
Merge "Always build squashfs host tools" into nyc-dev
...
am: 21e6bf3
* commit '21e6bf3b386cdf450671bc6ab96ef4834949579d':
Always build squashfs host tools
Change-Id: I9dc0f620ee3896bea615f8f40e72411f5ca1df06
2016-04-04 19:54:51 +00:00
Mohamad Ayyash
5c30f5b4bb
Merge "Always build squashfs host tools" am: ce30869
...
am: c7f86d7
* commit 'c7f86d7fdacfd8f97729114c7ea4887519c20111':
Always build squashfs host tools
Change-Id: I820fdf1e50f1c745248c3dcf1a4771c137eff9c5
2016-04-04 19:52:26 +00:00
Mohamad Ayyash
c7f86d7fda
Merge "Always build squashfs host tools"
...
am: ce30869
* commit 'ce3086971357779878ccf1f45e77e5ada82f8a59':
Always build squashfs host tools
Change-Id: Ib0f919c80845d6442b548454ac539029d61ebff4
2016-04-04 19:50:08 +00:00
Mohamad Ayyash
21e6bf3b38
Merge "Always build squashfs host tools" into nyc-dev
2016-04-04 19:46:48 +00:00
Mohamad Ayyash
ce30869713
Merge "Always build squashfs host tools"
2016-04-04 19:42:25 +00:00
Mohamad Ayyash
95fe0025c1
Always build squashfs host tools
...
Now that mac compatibility has been fixed
BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-04 12:33:24 -07:00
Mohamad Ayyash
5d65020e44
Always build squashfs host tools
...
Now that mac compatibility has been fixed
BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-04 12:31:41 -07:00
Miao Wang
d0d22c17d3
Merge "[RenderScript] Update the build rules for x86_64 support lib." am: 5d4d1d8
...
am: 7ff8c68
* commit '7ff8c68f7f993483b70c0a1377909e3a5f202648':
[RenderScript] Update the build rules for x86_64 support lib.
Change-Id: Iea184c3ae5c6218c6eff4656b3f3da29f38e72f9
2016-04-01 20:40:39 +00:00
Miao Wang
7ff8c68f7f
Merge "[RenderScript] Update the build rules for x86_64 support lib."
...
am: 5d4d1d8
* commit '5d4d1d8ebb8e2322fc6ae57bd15db001f314bf27':
[RenderScript] Update the build rules for x86_64 support lib.
Change-Id: I634e3c552cad73d289ebfa63ed8cdcbd0dab8400
2016-04-01 20:35:58 +00:00
Miao Wang
5d4d1d8ebb
Merge "[RenderScript] Update the build rules for x86_64 support lib."
2016-04-01 20:22:41 +00:00
Julien Desprez
b110d546c4
Add vts to build in ninja
...
am: 1287843
* commit '1287843ab714447d0fb1f6a42ce416f6cfe9db38':
Add vts to build in ninja
Change-Id: I455ac36b239668e4cc55f683ad21c5bea4348707
2016-04-01 17:05:43 +00:00
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
Julien Desprez
1287843ab7
Add vts to build in ninja
...
Bug: 27687012
Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
2016-04-01 15:39:48 +01: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
4121aa9bb8
[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
(cherry picked from commit 57ef7ea490
)
2016-03-31 15:26:24 -07: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
Dan Albert
658d1e0434
Update NDK libc++ header paths.
...
The r11 libc++ uses libc++abi instead of libgabi++.
Bug: http://b/27801981
Change-Id: I5b90c14125dc024b2b290897bb3ef1c8d9546a7b
2016-03-31 14:22:09 -07: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