Commit Graph

2276 Commits

Author SHA1 Message Date
Pirama Arumuga Nainar
09a6e45d07 Merge "Export TSAN_RUNTIME_LIBRARY make variable"
am: 9e3f627ea7

Change-Id: I5d78bc0b33411c3832a734521cb5ca305a4f8d9a
2017-03-29 00:49:38 +00:00
Treehugger Robot
9e3f627ea7 Merge "Export TSAN_RUNTIME_LIBRARY make variable" 2017-03-29 00:45:35 +00:00
Colin Cross
e267ef166c Merge changes If05b0f5f,I8cd1ef21
am: 32b692240f

Change-Id: Iedd849e43c6dac04657e1bd29ff1324b1a34c93e
2017-03-28 21:39:09 +00:00
Colin Cross
32b692240f Merge changes If05b0f5f,I8cd1ef21
* changes:
  Add support for test_suites property on cc_test modules
  Remove -Wl,--allow-shlib-undefined from arm64
2017-03-28 21:25:54 +00:00
Makoto Onuki
209d19a161 Merge "Add fileslist.go to calculate hashes in parallel"
am: 03a1ba34a2

Change-Id: I88815fc0b215405d425c9895b75655330436d5a2
2017-03-28 16:50:23 +00:00
Makoto Onuki
03a1ba34a2 Merge "Add fileslist.go to calculate hashes in parallel" 2017-03-28 16:41:05 +00:00
Dan Willemsen
d1611849fa Fix variant errors when compiling with the NDK
am: 7cbf5f8e22

Change-Id: I1aba4b79d1e8ded5665f21bb0a31deebb5dc2afa
2017-03-28 08:58:21 +00:00
Dan Willemsen
7cbf5f8e22 Fix variant errors when compiling with the NDK
This was corrupting the nonvariants list with the variants list whenever
it hit the else case, causing a missing variant issue, since we need to
use the variant when linking against lib*.ndk.

Test: aosp_arm build.ninja is the same before/after
Test: https://android-review.googlesource.com/c/355163/, set
      BOARD_VNDK_VERSION := current
Change-Id: I047937e838464670d0902506871d2203ec8cc17d
2017-03-28 07:15:11 +00:00
Dan Willemsen
f82effe6cb Merge "Fix absolute paths in clang debug output"
am: 107ed82035

Change-Id: I3e3ee05a40e4868d165d88a5c080069f4423e946
2017-03-28 05:21:40 +00:00
Dan Willemsen
107ed82035 Merge "Fix absolute paths in clang debug output" 2017-03-28 05:17:38 +00:00
Fabien Sanglard
6c35495bfe Merge "[CMakeList generator] Fix executable name"
am: 27b812d0d2

Change-Id: I3e80c00d82e2a0a5f1f981253fd55fcba517c784
2017-03-28 00:39:22 +00:00
Fabien Sanglard
27b812d0d2 Merge "[CMakeList generator] Fix executable name" 2017-03-28 00:30:18 +00:00
Dan Willemsen
253cab89ee Fix absolute paths in clang debug output
As of the latest clang python wrapper, clang is being executed with an
absolute path. That means that clang-provided headers are written with
absolute paths in the debug info, making the builds non-reproducible
(especially with ccache).

So keep our current PWD=/proc/self/pwd -fdebug-prefix-map=/proc/self/cwd=,
but add a new -fdebug-prefix-map=$PWD/= to rewrite these absolute paths.

Bug: 36463318
Test: m -j libc adb; grep for path names
Test: spot check objdump -W before/after, see only expected diffs.
Change-Id: Ic2cdfca051d3c38b753fd5c1fcbeaca8bafc29ae
2017-03-27 16:58:43 -07:00
Colin Cross
a929db05b3 Add support for test_suites property on cc_test modules
Add a test_suites property that is passed through to make as
LOCAL_COMPATIBILITY_SUITES.

Test: m -j checkbuild, examine out/soong/Android-${TARGET_PRODUCT}.mk
Bug: 35394669
Change-Id: If05b0f5f7d6dd85228546123bebe32859bcc8186
2017-03-27 16:27:50 -07:00
Nan Zhang
16aaa5cbe4 Removed unused return variables.
am: 43a485cfb1

Change-Id: I2bf2062fd506fc1a38aa45e789a52170aab25fb1
2017-03-27 23:10:16 +00:00
Nan Zhang
43a485cfb1 Removed unused return variables.
Sometimes it is confused that these variables are mixed with ninja
parameters when invoking pctx.AndroidStaticRule()/SourcePathVariable().

Test: m -j
Change-Id: Ibcf17eeed6ac79aafaa5edeec27427721b36e75a
2017-03-27 14:27:58 -07:00
Pirama Arumuga Nainar
16b626b827 Export TSAN_RUNTIME_LIBRARY make variable
TSAN_RUNTIME_LIBRARY is used by external/clang/Android.mk to get the
name of the per-arch TSAN runtime.  This CL also factors-out common code
out of functions that construct names of the sanitizer libraries.

Test: python external/clang/build.py with all CLs in this topic

Change-Id: Ie5fac242c0d5a9296ab8936db927a4c934061aa4
2017-03-27 11:29:52 -07:00
Makoto Onuki
620e6ad381 Add fileslist.go to calculate hashes in parallel
Bug: 36274890
Test: Manual

Change-Id: I548da5607cf3b993ad21cbb04a57fcbd5bfb7f51
2017-03-24 10:16:39 -07:00
Fabien Sanglard
7da4926263 [CMakeList generator] Fix executable name
Treble genererated project name feature character no accepted by
CMake. So far only @ is a problem.

Change-Id: Iac460033f1181f46ab8205e5706271f99ab798d3
2017-03-23 17:50:26 -07:00
Fabien Sanglard
163bdc0658 Merge "CMakelists generator: Maintain include order"
am: e7ee3c7bc2

Change-Id: I77beff2a83ea038b9dbf530378e526a1be0e155b
2017-03-23 23:43:11 +00:00
Fabien Sanglard
e7ee3c7bc2 Merge "CMakelists generator: Maintain include order" 2017-03-23 23:38:36 +00:00
Colin Cross
dc03a8407e Remove -Wl,--allow-shlib-undefined from arm64
Hopefully this isn't needed any more.

Test: m -j checkbuild
Change-Id: I8cd1ef21c37bb85a322674532b3cd6816280da67
2017-03-22 17:10:29 -07:00
Nan Zhang
513d87314a Merge "Added functionality in soong_zip that supports adding root prefix."
am: e28c098504

Change-Id: I0f769fc5a3573b841548ba54cfcf2fd683730931
2017-03-22 01:42:53 +00:00
Treehugger Robot
e28c098504 Merge "Added functionality in soong_zip that supports adding root prefix." 2017-03-22 01:39:20 +00:00
Fabien Sanglard
6747241b83 CMakelists generator: Maintain include order
For some library, the order of includes is important. e.g: library
can include "system/window.h". Dependending on the dependency order
this could mean libs/nativewindow/include/system/window.h or
system/core/include/system/window.h

This patch changes search path storage from map to array in order
to preserve order the order in which they were received from
soong.

Change-Id: I8ef788633985f4ed04ec3432686eb1427f73d600
Test: Manual
2017-03-21 11:18:10 -07:00
Alexey Frunze
45d6962046 Merge "MIPS: Adjust LibartImgDeviceBaseAddress() for CC GC."
am: 2b4908b578

Change-Id: I595712ec3eb8e5763ec6af9c45b1aa6526105b75
2017-03-21 12:06:41 +00:00
Treehugger Robot
2b4908b578 Merge "MIPS: Adjust LibartImgDeviceBaseAddress() for CC GC." 2017-03-21 12:02:28 +00:00
Alexey Frunze
6e5dfaaeb1 MIPS: Adjust LibartImgDeviceBaseAddress() for CC GC.
The concurrent copying GC allocates large contiguous
space at low addresses. This moves the image(s) out
of the way to higher addresses.

Test: booted MIPS32R2 in QEMU
Test: booted MIPS64 (with 2nd arch MIPS32R2) in QEMU

Change-Id: I1c54e6142844ab1ad7820765ae313650e9ab8875
2017-03-20 16:58:43 -07:00
Colin Cross
79e8c7dc6a Merge "Support owner property"
am: 43dd94cf66

Change-Id: Ica82eba5e737f554934faff62fe208597bd25742
2017-03-20 22:40:05 +00:00
Colin Cross
43dd94cf66 Merge "Support owner property" 2017-03-20 22:34:55 +00:00
Vishwath Mohan
d8e1da8281 Merge "Add ar flags for CFI enabled components in Soong."
am: ed1665dc8a

Change-Id: Ie527e5b108fd6220498f3c7098711d5bed199ec2
2017-03-20 22:14:45 +00:00
Treehugger Robot
ed1665dc8a Merge "Add ar flags for CFI enabled components in Soong." 2017-03-20 22:08:03 +00:00
Colin Cross
c6bcdef0fe Merge changes from topic 'prebuilts'
am: e3918170ae

Change-Id: I1c41397dacf36a9e496373cda09a3639b0958078
2017-03-20 20:57:35 +00:00
Colin Cross
86f096f3fe Rename to cc_prebuilts_library_shared
am: dfee1bcf43

Change-Id: I62997de7c8911ca8cd88346e6d0864259515b6e2
2017-03-20 20:57:30 +00:00
Colin Cross
1ec90a17ff Fix installing prebuilts with no source module
am: c3e7fa65b4

Change-Id: Ia73b5cccce98b12beee2796b325d46d0c80139c2
2017-03-20 20:57:24 +00:00
Colin Cross
e3918170ae Merge changes from topic 'prebuilts'
* changes:
  Add support for binary and static library and prebuilts
  Rename to cc_prebuilts_library_shared
  Fix installing prebuilts with no source module
2017-03-20 20:51:45 +00:00
Colin Cross
55708f3fb3 Support owner property
Support owner properties in Android.bp files and propagate the value
to make using LOCAL_MODULE_OWNER.

Bug: 36413696
Test: builds
Change-Id: Iac1cf7f2a14c9e3e6d85d6e09d5adb08a7078d00
2017-03-20 13:33:45 -07:00
Nan Zhang
9067b04ffb Added functionality in soong_zip that supports adding root prefix.
Added -P flag in soong_zip:
It provided a path prefix which will be added in front after -f/-l was
applied with -C.

eg. ./soong_zip -o /path1/../ -P a/c -C d/e -f d/e/test.txt

zip_dest: a/c/test.txt

Bug: b/31676493
Test: go build -a to build a real soong_zip, and test it with real
files.
Change-Id: Ic924ba252e963ca5847c370f733058888426b696
2017-03-20 10:59:49 -07:00
Dan Willemsen
d6d00b3281 Merge "Revert "install *.so in different paths for their types""
am: 3250879667

Change-Id: Ia5867d7b44c3601a2d87b6943580fb9d6fa602ec
2017-03-17 22:52:56 +00:00
Treehugger Robot
3250879667 Merge "Revert "install *.so in different paths for their types"" 2017-03-17 22:45:31 +00:00
Colin Cross
dfee1bcf43 Rename to cc_prebuilts_library_shared
Rename cc_prebuilts_shared_library to cc_prebuilts_library_shared
to match cc_library_shared.

Test: builds
Change-Id: I2f48263c3a0830a99ace4e2374de4a702d48c2e4
2017-03-17 14:06:28 -07:00
Colin Cross
de89fb8707 Add support for binary and static library and prebuilts
Add cc_prebuilt_library_static and cc_prebuilt_binary module types.

Bug: 35576244
Test: Add cc_prebuilt_library_static and cc_prebuilt_binary modules
      and verify they are used
Change-Id: I708ec7b1ed1a0eddae083159575ae04d5ea25a37
2017-03-17 14:06:28 -07:00
Colin Cross
c3e7fa65b4 Fix installing prebuilts with no source module
Prebuilts that were not overriding a source module would never
get UsePrebuilt set, which would cause SkipInstall() to be called,
and prevent the module from being exported to make.

Test: prebuilt_test.go
Change-Id: Ib09300efff26f09245331e9919ae2db82b0c3625
2017-03-17 14:06:25 -07:00
Nan Zhang
1a7c7a9cee Merge "Fixed the issue of dependencyTag in prebuilt.go"
am: 6bdcc8ddd6

Change-Id: I6d1009bfcbafb85c0f1a2cb1eb16dc495a4b1ce4
2017-03-17 18:53:04 +00:00
Treehugger Robot
6bdcc8ddd6 Merge "Fixed the issue of dependencyTag in prebuilt.go" 2017-03-17 18:46:51 +00:00
Colin Cross
d3591b0d0e Merge "Use a minimal set of mutators, module types, and singletons for tests"
am: 054350e8f1

Change-Id: I8d85830ecbbdace4910edd11c60ad3b12269d43b
2017-03-17 05:09:05 +00:00
Colin Cross
054350e8f1 Merge "Use a minimal set of mutators, module types, and singletons for tests" 2017-03-17 05:05:03 +00:00
Dan Willemsen
615609854f Revert "install *.so in different paths for their types"
This reverts commit 4c48f724e1. It's
causing test failures, warnings and complaints, so backing it out and
we'll resolve those before putting it back in.

Bug: 33681361
Test: m -j
2017-03-16 19:48:32 -07:00
Jeff Gaston
05a53fc769 Merge "Have AndroidMk skip emitting LOCAL_MODULE_TAGS="optional""
am: 33edec5651

Change-Id: I7fff83287127c9b22d38ea75fd37be2c547b7d93
2017-03-16 23:50:13 +00:00
Colin Cross
795c377e14 Use a minimal set of mutators, module types, and singletons for tests
Calling android.NewContext() in tests results in a context that
contains all the mutators, module types, and singletons, which
causes unexpected interactions in unit tests.  Create an empty
context instead, and add in only the necessary mutators, module
types, and singletons.

Bug: 36366816
Test: soong tests
Change-Id: Ic61262c37e3436b3ad4ccaca18b737021c304be6
2017-03-16 16:50:10 -07:00