Dan Willemsen
274d041107
Merge "Remove objclean" am: 1d4b79dde2 am: beaa6df59f
...
am: b4773ae479
2016-09-16 22:11:31 +00:00
Dan Willemsen
b4773ae479
Merge "Remove objclean" am: 1d4b79dde2
...
am: beaa6df59f
2016-09-16 22:02:31 +00:00
Dan Willemsen
da7d25f2d1
Remove objclean
...
We don't need to manually remove objects when switching SANITIZE_TARGET
-- that will be handled by Ninja noticing that the command lines are
different.
Bug: 30947985
Test: None
Change-Id: I83c15981cf6ea258bb7fa85490b0b1ede1058aa6
2016-09-16 12:53:20 -07:00
Dan Albert
d11f78fbd5
Use libcompiler-rt_extras with NDK builds. am: c28e4bcb1c am: d042352816
...
am: d7c48e9f9d
2016-09-16 06:54:03 +00:00
Dan Albert
3f0f58a60b
Always link libdl with libc++ for the NDK. am: 2936a1e84b am: ec6223ec3c
...
am: 7fde1f9c6e
2016-09-16 06:53:55 +00:00
Dan Albert
d7c48e9f9d
Use libcompiler-rt_extras with NDK builds. am: c28e4bcb1c
...
am: d042352816
2016-09-16 06:51:03 +00:00
Dan Albert
7fde1f9c6e
Always link libdl with libc++ for the NDK. am: 2936a1e84b
...
am: ec6223ec3c
2016-09-16 06:50:54 +00:00
Dan Albert
d042352816
Use libcompiler-rt_extras with NDK builds.
...
am: c28e4bcb1c
2016-09-16 06:45:32 +00:00
Dan Albert
ec6223ec3c
Always link libdl with libc++ for the NDK.
...
am: 2936a1e84b
2016-09-16 06:45:23 +00:00
Treehugger Robot
7b351cadfc
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
...
* changes:
Use libcompiler-rt_extras with NDK builds.
Always link libdl with libc++ for the NDK.
2016-09-16 06:40:32 +00:00
Ryan Campbell
4fac69d7ca
Merge "Fix typo in coverage target out path." am: c6507670f2 am: 1fd609359d
...
am: ee20a35082
2016-09-16 02:19:03 +00:00
Ryan Campbell
ee20a35082
Merge "Fix typo in coverage target out path." am: c6507670f2
...
am: 1fd609359d
2016-09-16 02:16:02 +00:00
Ryan Campbell
737bc02ee8
Fix typo in coverage target out path.
...
Change-Id: I4a448708ab74e08b2c515039ee5d71c32861214e
2016-09-15 17:32:13 -07:00
Colin Cross
2d5011fd0e
Merge "Remove SRC_SYSTEM_HEADERS" am: 4a6862e59b am: 195857c6dd
...
am: e0e5754f23
2016-09-15 18:44:28 +00:00
Colin Cross
e0e5754f23
Merge "Remove SRC_SYSTEM_HEADERS" am: 4a6862e59b
...
am: 195857c6dd
2016-09-15 18:41:57 +00:00
Treehugger Robot
4a6862e59b
Merge "Remove SRC_SYSTEM_HEADERS"
2016-09-15 18:27:45 +00:00
Colin Cross
4ed13c38a5
Remove SRC_SYSTEM_HEADERS
...
It is inherited from Soong now.
Bug: 31492149
Change-Id: Ia9bfd9662dba16032dac68b55b4f0743c0688139
2016-09-15 09:29:15 -07:00
Yoshisato Yanagisawa
a25256f715
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748 am: 4d5f3043a2
...
am: 57e615605c
2016-09-15 03:55:44 +00:00
Yoshisato Yanagisawa
57e615605c
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748
...
am: 4d5f3043a2
2016-09-15 03:53:43 +00:00
Treehugger Robot
766c348748
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
2016-09-15 03:41:24 +00:00
Dan Albert
c28e4bcb1c
Use libcompiler-rt_extras with NDK builds.
...
We want to build things in CTS (things built against the NDK) with
integer overflow checks. Some projects in the tree also make explicit
calls to the overflow checked builtins, and those projects need to be
built with the NDK (external/dng_sdk is the specific example that
brought this up).
Test: make checkbuild tests
Bug: None
Change-Id: Iab27dd0d931f723140de242049fa72f3b1ce0fb8
2016-09-14 16:08:48 -07:00
Dan Albert
2936a1e84b
Always link libdl with libc++ for the NDK.
...
libc++ requires libdl whether it's statically linked or not.
Test: make checkbuild tests
Bug: None
Change-Id: I8abdcfaef779b358196716ab1193cebe278317ac
2016-09-14 16:08:04 -07:00
Dan Willemsen
196f190592
Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6 am: f9fc0ea6fe
...
am: 7c4ced5337
2016-09-13 22:51:35 +00:00
Dan Willemsen
7c4ced5337
Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6
...
am: f9fc0ea6fe
2016-09-13 22:48:36 +00:00
Dan Willemsen
5bdd08b2d9
Fix shared library install dependencies outside of /system
...
For properly picking the shared library install dependencies, HOST_OUT
and HOST_CROSS_OUT are necessary so that we don't add a dependency
between Linux and Windows. But for target modules, we must use
TARGET_OUT_ROOT instead of TARGET_OUT, or modules in /data and /vendor
won't have proper install dependencies.
Bug: 31462199
Test: m bionic-unit-tests; manual diff of generated ninja file
Change-Id: I828fa2664613296cc6c431813f5657abffdd2b8f
2016-09-13 13:47:06 -07:00
Ryan Campbell
5a63fe6856
Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07 am: 6b92bb4ebb
...
am: 577eab3323
2016-09-13 20:01:23 +00:00
Ryan Campbell
577eab3323
Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07
...
am: 6b92bb4ebb
2016-09-13 19:58:51 +00:00
Ryan Campbell
1e1ecd5d07
Merge "Implement path-based enabling of code coverage."
2016-09-13 19:48:34 +00:00
Dan Willemsen
93a0afc749
Merge "Fix building static linux binaries" am: 8bb71cef9f am: 5cf6a4578d
...
am: a4f8d8b2a3
2016-09-13 19:34:23 +00:00
Dan Willemsen
a4f8d8b2a3
Merge "Fix building static linux binaries" am: 8bb71cef9f
...
am: 5cf6a4578d
2016-09-13 19:31:22 +00:00
Dan Willemsen
c9aa6fca41
Fix building static linux binaries
...
BUILD_HOST_static has been broken because I was stripping
-Wl,--start-group/-Wl,--end-group into a separate set of ldflags instead
of keeping them wrapped around some of the ldlibs. So don't pass some of
the build system flags through the ldlibs checker.
Bug: 30898128
Change-Id: I332b42679695cdc5da3cb0036290b6a3544699c0
2016-09-13 17:48:07 +00:00
Ryan Campbell
81c9d29dad
Implement path-based enabling of code coverage.
...
Native coverage is enabled by setting NATIVE_COVERAGE to true
and specifying a list of paths in the COVERAGE_PATHS
environment variable. Files are exported to a zip file in the
target out directory.
Change-Id: I66a2ddd88e849bec1cc0cdae1b51fe18a007e2c3
2016-09-13 10:27:25 -07:00
Dan Willemsen
d111debc18
resolve merge conflicts of 8dadc2d to nyc-mr1-dev-plus-aosp
...
Change-Id: I296a81c17f9311a9425619141e1b5f5f5fb4c0dc
2016-09-12 21:43:19 -07:00
Dan Willemsen
8dadc2d2e6
Merge "Remove incremental workaround for aapt overlays" am: 946e58bdff
...
am: cd573e3aef
2016-09-13 04:38:22 +00:00
Yoshisato Yanagisawa
a2ca270502
goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set.
...
During the development of goma client, we sometimes need to use goma
compiler_proxy, which has already been running.
Test: NOSTART_GOMA=1 USE_GOMA=1 m.
Change-Id: Ifa969c40871325fd43ee6443ddbe3b18fde62c5a
2016-09-13 13:13:52 +09:00
Dan Willemsen
8e6e6fdba9
Remove incremental workaround for aapt overlays
...
This workaround to clean package intermediates is no longer necessary,
as ninja reruns commands whose command line changes.
Test: switch between product overlays that use add-resource, verify
R.java is regenerated.
Change-Id: Icb1f76360e39882e4401180414a031956777b020
2016-09-12 20:30:12 -07:00
Alan Viverette
c33fe0838d
Add transition support library to docs path to fix build am: 9c535433df
...
am: ec58ebb4ee
2016-09-13 02:27:19 +00:00
Alan Viverette
ec58ebb4ee
Add transition support library to docs path to fix build
...
am: 9c535433df
2016-09-13 02:22:17 +00:00
Dan Willemsen
73da86ee11
Merge "Remove speex from the pathmap" am: fbfff3129e am: 7da7001c18
...
am: 50e79ad9ce
2016-09-13 00:21:35 +00:00
Dan Willemsen
50e79ad9ce
Merge "Remove speex from the pathmap" am: fbfff3129e
...
am: 7da7001c18
2016-09-13 00:19:05 +00:00
Treehugger Robot
fbfff3129e
Merge "Remove speex from the pathmap"
2016-09-13 00:07:28 +00:00
Dan Willemsen
208d3c2461
Remove speex from the pathmap
...
libspeexresampler uses LOCAL_EXPORT_C_INCLUDE_DIRS to export this path
to all of its users already.
Test: m libaudiopreprocessing libaudioutils
Change-Id: I682303142840d6f0f02c990de8e713620840bbda
2016-09-12 16:16:50 -07:00
Dan Albert
45fe3712fc
Merge "Update NDK gtest lib names." am: 56c2a18a50 am: 146540b535
...
am: 5eb8f65378
2016-09-12 21:24:56 +00:00
Dan Albert
5eb8f65378
Merge "Update NDK gtest lib names." am: 56c2a18a50
...
am: 146540b535
2016-09-12 21:09:54 +00:00
Treehugger Robot
56c2a18a50
Merge "Update NDK gtest lib names."
2016-09-12 20:48:42 +00:00
Dan Willemsen
2277a46756
Merge "Fix libgcov.a dependency" am: f9d5fb97cb am: 4b9f214a7b
...
am: 64deaba889
2016-09-12 19:23:13 +00:00
Dan Willemsen
64deaba889
Merge "Fix libgcov.a dependency" am: f9d5fb97cb
...
am: 4b9f214a7b
2016-09-12 19:19:42 +00:00
Dan Willemsen
7db70a3b0a
Fix libgcov.a dependency
...
Now that Soong is generating libgcov.a, we need a dependency here.
Change-Id: Ie8d97339fd584eed178cc57b9333d38754ab1135
2016-09-12 18:09:20 +00:00
David Brazdil
29441f934d
resolve merge conflicts of 0976590 to nyc-mr1-dev-plus-aosp
...
Change-Id: I67a45fd1d034f143e9605cc2576c16aea4f8dbc9
2016-09-12 16:58:12 +01:00
David Brazdil
0976590e04
Merge "Update build rules for VDEX" am: 3a04e1b82f
...
am: 50513362fa
2016-09-12 15:09:08 +00:00
