Commit Graph

1786 Commits

Author SHA1 Message Date
Colin Cross
c0d58b4a0f Fix envDeps initialization and locking
If Config.GetEnv was called when envDeps was uninitialized (for
example in a test) it would panic, which if recovered (for example in
a test) would cause it to continue without unlocking the mutex, and
could later deadlock.  Fix the initialization by initializing in
GetEnv if necessary, and use defer to avoid holding the mutex after
a panic.

Test: soong tests
Change-Id: I453522faaf47ff6fbc4702345cfe177100bdc522
2017-02-06 15:45:16 -08:00
Colin Cross
c821042c3f Merge "Fix zip tests" 2017-02-06 21:17:21 +00:00
Colin Cross
77de5a4b9d Merge "Support data properties for test binaries" 2017-02-06 21:17:12 +00:00
Treehugger Robot
721197de2c Merge "Add c_std and cpp_std properties." 2017-02-06 19:18:27 +00:00
Colin Cross
d1b8d760b5 Allow non-tool dependencies in genrules
The genrule tool dependency handling was rejecting any dependencies
that were not tools.  This caused a failure when ExtractSourceDeps
added a source file dependency on a filegroup module.  Remove the
unnecessary check in the tool handling.

Test: builds
Bug: 35002681
Change-Id: Ibd8dff306be3ef55aac2e12a28ddc187be2234d9
2017-02-04 12:45:03 -08:00
Dan Albert
043833ca81 Add c_std and cpp_std properties.
Test: Checked showcommands ouput for each setting.
Bug: None
Change-Id: Ibe02352f19ca2777b9a419136270e5c4390f1149
2017-02-03 16:45:38 -08:00
Evgenii Stepanov
a83fdacf7c Disable CFI on Mips and add -march to linkflags on ARM.
Mips toolchain does not have ld.gold.
ARM change is a workaround for LLVM r290384.

Bug: 33678192
Test: make ENABLE_CFI=1
Change-Id: I189ffd42760f0ea8d151717337b9355b37cb207b
2017-02-03 23:50:28 +00:00
Evgenii Stepanov
cb3f890263 Remove duplicate code.
Test: NFC
Change-Id: I63a1b1ee244c2ab015914e1879aefc3ba8f886b0
2017-02-03 13:25:03 -08:00
Colin Cross
e281d3395b Fix zip tests
Fix error when building zip tests running go test ./...:
android/soong/third_party/zip/zip_test.go:13:2: use of internal package not allowed

Test: go test ./...
Change-Id: I4fd7317401fd3d9c95c6f11799c94c1eff25523e
2017-02-02 16:46:33 -08:00
Colin Cross
faeb7aa135 Support data properties for test binaries
Allow tests to specify a data property that lists files or filegroup
modules that will be packaged alongside the test.  Also add a path
property to filegroup modules to allow shifting the path of the
packaged files, and add ExpandSourcesSubDir to expand the filegroup
sources while including a shifted relative path in the Paths objects.

Test: soong tests, manually adding data to a module
Change-Id: I52a48942660e12755d313ef13279313361b4fc35
2017-02-02 16:23:30 -08:00
Colin Cross
294941bee9 Update soong to use pathtools.FileSystem
Update soong to follow changes in
https://github.com/google/blueprint/pull/141

Test: soong tests
Change-Id: I49a9b83cac7590dc75b26b31136b8707c188bc4a
2017-02-02 16:19:56 -08:00
Nan Zhang
b9eeb1d79a Fixed then comments to describe how to use android.ModuleBase object.
Since we have changed the package name from 'common' to 'android'

Test: Manual.
Change-Id: Ic9649f3216609b36fa31db096509de42f83e9ba4
2017-02-02 10:59:16 -08:00
Colin Cross
7fc17dbfce Remove extra basePath from ModuleSrcPath
ModuleSrcPath contains an embedded basePath as well as a
SoucePath that contains another basePath.  Remove the embedded
basePath, and make the SourcePath embedded.

Test: no change to build.ninja
Change-Id: I3cdf3477eca41ed35fac08a892aab22cbcdb2224
2017-02-01 15:14:31 -08:00
Stephen Hines
e25bc9ba83 Merge "Switch to clang-3688880." 2017-02-01 21:25:03 +00:00
Stephen Hines
d19f58a162 Switch to clang-3688880.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I386c7fc06bd4ca092535365bccbed0a898eb69da
2017-01-31 12:13:37 -08:00
Colin Cross
7a108bccad Allow clang builds to disable -pie
-pie triggers a bug in glibc's linker when used with goma
(https://sourceware.org/bugzilla/show_bug.cgi?id=16381).  Allow
the clang build to disable -pie for host modules through the
DISABLE_HOST_PIE environment variable so it can produce a toolchain
that works with goma.

Bug: 15814177
Bug: 34722791
Change-Id: Ic664a1b821aaeaf2bde14b0afa1a1975e31300cb
2017-01-30 22:51:59 -08:00
Treehugger Robot
5951d3e2bb Merge "Fixed androidmk crash when parsing external/aac/Android.mk" 2017-01-28 00:05:07 +00:00
Nan Zhang
62ea583316 Fixed androidmk crash when parsing external/aac/Android.mk
Catched the error when bpparser encountered the non-standard make variables.

Bug: b/34454142
Test: Manual + (m -j blueprint_tools) command
Change-Id: I0766082baa2c2c4020317f975012a476133f4f77
2017-01-27 14:07:38 -08:00
Dan Albert
dc2597d25a Don't force libraries upon static executables.
The linker uses libc++_static but needs to avoid the libc.a
dependency. It does this by setting `stl: "none"` and manually
linking libc++. This behavior matches make.

A better approach would probably be to generalize system_shared_libs
to system_libs and apply those to static executables the same way we
do for dynamic ones, but that's a patch for another day.

Test: make checkbuild
Bug: http://b/34740564
Change-Id: Ie9da0d49a453a220593e8ec2ee721e9af9378007
2017-01-26 17:44:26 -08:00
Treehugger Robot
29c69e83dd Merge "Add libc++ and libc++_static aliases for SDK builds." 2017-01-26 21:28:11 +00:00
Brian Carlstrom
7f205c8289 Merge "Revert "Switch to clang-3625443."" 2017-01-26 08:05:35 +00:00
Stephen Hines
73431cb86e Revert "Switch to clang-3625443."
This reverts commit 1d7513decd.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ida39c91bfc70ba60b2a3113544ec43c566b6c494
2017-01-26 07:59:16 +00:00
Treehugger Robot
49110a5d88 Merge "Switch to clang-3625443." 2017-01-26 07:13:21 +00:00
David Benjamin
87f9f03d3f Add libc++ and libc++_static aliases for SDK builds.
c++_shared and c++_static are named libc++ and libc++_static in every
other mode. Allow the same names so targets which are built for both
host and device with SDK may specify a single name for the STL.

Test: external/boringssl is able to use "libc++_static" as the STL.
Change-Id: Ibc579c7e24ddb8de12fbfc6e1b5d80648efa589e
2017-01-25 16:47:31 -05:00
Evgenii Stepanov
774cb81796 Disable global coverage when a module disables asan.
With SANITIZE_TARGET="address coverage", if a module disables ASan
(address: false), it is left with just coverage, which is not
supported. In that case, disable coverage as well.

Bug: 33091541
Test: see above
Change-Id: Idcd04dad8cab7c7e2644d2408b1b8a381490e5af
2017-01-24 20:55:11 +00:00
Stephen Hines
1d7513decd Switch to clang-3625443.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I9891e817342e45f16afa4acb57d2d136e16161a6
2017-01-23 15:05:27 -08:00
Evgenii Stepanov
7ebf9fa3c9 Force Thumb for CFI targets.
Bug: 22033465
Test: bionic device tests
Change-Id: I672ccc970309631fa895b7134a32c0d403a2151e
2017-01-20 14:13:32 -08:00
Vishwath Mohan
97673c06d8 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Vishwath Mohan
1b017a76e1 Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Iccc6e4bf5e7828ab8ce6056f3e40922712faa0d8
2017-01-19 14:40:34 -08:00
Dan Willemsen
0fe7253718 Export cc_test as Make class NATIVE_TESTS
So that make can tell the difference.

Bug: 32177952
Test: Diff build-aosp_arm64.ninja before/after
Change-Id: Icd98ea5f5b4127bf84197c6b651a72708eec57f1
2017-01-17 13:25:49 -08:00
Colin Cross
1a01e83725 Document examples of conditionals in go
Test: None
Change-Id: Ie2ad921974dc4ff82a3c6308736830cacfebf806
2017-01-13 18:07:01 -08:00
Colin Cross
708c424c57 Allow genrules to reference generated sources
Call ExtractSourceDeps on genrule srcs properties.

Bug: 34283327
Test: no change to build.ninja
Change-Id: I934a418f32d4c94400728579543ca5c910bf7dfc
2017-01-13 18:06:58 -08:00
Jack He
8cc714313c Add Android.bp variables to the soong build parser
* BtConfigIncludeDir: BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BtHcilpIncluded: BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: BLUETOOTH_HCI_USE_MCT

Bug: 32958753
Test: Code compilation, no user visible effects

Change-Id: I0dc53172ee823e4e0fa69749e1297713796538cf
2017-01-11 16:07:44 -08:00
Tri Vo
9b165dd015 Add test/vts-testcase/* to root.bp
Test: make vts
Change-Id: I863d30344c67e11429009be5ea99bc4e592bcb15
2017-01-07 00:19:00 +00:00
Treehugger Robot
59bed87517 Merge "Allow unversioned_until: "current"." 2017-01-06 05:14:38 +00:00
Dan Albert
022e7a3839 Allow unversioned_until: "current".
Since most system libraries aren't actually versioned yet, we
shouldn't be building the stub libraries with version info just yet.
Setting `unversioned_until: "current"` will not use the version
script for anything but android-current (this way when the version
script is applied, we'll immediately catch it if they don't match).

Test: Updated frameworks/wilhelp to use this, make ndk
Bug: https://github.com/android-ndk/ndk/issues/278
Change-Id: I0dab7fd21bb0f063c39368d37feaa3f822e908ce
2017-01-05 15:49:09 -08:00
Treehugger Robot
8465094252 Merge "Add development/*/Android.bp." 2017-01-05 03:30:45 +00:00
Logan Chien
86b87ed270 Add development/*/Android.bp.
This commit replace development/ndk with development/* so that soong
will load Android.bp from development/vndk as well.

Test: lunch aosp_arm64-eng && make native
Change-Id: I849647f68b2ce90fd598b1b314b492c7945dc2df
2017-01-04 18:46:18 +08:00
Dan Albert
98dbb3bc2d Add unversioned_until to ndk_library.
This defaults to the value of first_version, and should almost never
be used. This is only needed to work around platform bugs like
https://github.com/android-ndk/ndk/issues/265.

Test: Set `unversioned_until: "24"` for libGLESv3.ndk, readelf on the
      android-23 and android-24 outputs to check for version info.
Bug: https://github.com/android-ndk/ndk/issues/265

Change-Id: Ie44b170daad692fdc98e7d7c5f10f9077930b8a9
2017-01-03 15:16:29 -08:00
Dan Albert
ae452ccb7f Support versioned=%d at the section level.
Test: nose2
Bug: https://github.com/android-ndk/ndk/issues/265
Change-Id: I4c22cb8069f41861613ecf01f7e1adbe1d3118a9
2017-01-03 14:27:41 -08:00
Dan Willemsen
3340d6091c Allow disabling the named test directory for cc_test
Some external test suites (LTP in this case), have their own expected
layout, and don't fit well with our
/data/nativetest/<testname>/<testname> layout, nor do they work with
test_per_src.

So allow setting no_named_install_directory along with
relative_module_path to specify a custom test path:

  no_named_install_directory: true,
  relative_module_path: "ltp/testcases/bin",

Test: Convert LTP
Change-Id: Ib002c058674e8b960a4fdc3af1a25c8bcaeb1d63
2016-12-27 14:40:40 -08:00
Steven Moreland
b527d5dfbe Revert "Revert "root.bp: Add vendor/*/*""
This reverts commit b3aaaea54b.

Change-Id: I8ff4424f983b259fc1c1938350aa6299f1c3f0c3
2016-12-20 20:38:15 +00:00
Treehugger Robot
cf767e7c9d Merge "root.bp: Use system/*" 2016-12-20 20:25:09 +00:00
Treehugger Robot
5c8b8c6d6e Merge "Do not duplicate arch properties when cpu variant == arch variant" 2016-12-20 20:01:38 +00:00
Dan Willemsen
f6a4682767 root.bp: Use system/*
Test: Soong's build.ninja identical before/after (except GlobRules)
Change-Id: I2fcdcd77083cbb49dc6b20a169964558510d91dc
2016-12-20 10:57:30 -08:00
Hiroshi Yamauchi
6e2557fa88 Merge "Add ArtUseReadBarrier to ProductVariables." 2016-12-20 18:56:20 +00:00
Colin Cross
0801633173 Do not duplicate arch properties when cpu variant == arch variant
build/make/board/generic_mips/BoardConfig.mk sets
TARGET_CPU_VARIANT := TARGET_ARCH_VARIANT, which can cause the same
variant-specific properties to be applied twice.

Test: lunch aosp_mips-eng && mmma -j external/skia TARGET_ARCH_VARIANT=mips32r2dspr2-fp
Change-Id: Ie4abe804f8ce898bf89664ae749b9bc8ac3e649f
2016-12-20 09:53:14 -08:00
Hiroshi Yamauchi
e2a106353f Add ArtUseReadBarrier to ProductVariables.
Bug: 33492005
Test: top-level angler build.
Change-Id: Ib04284bac923a143038655d495bcbacaabf61440
2016-12-19 15:31:32 -08:00
Colin Cross
c7ebf44d65 Merge "Revert "root.bp: Add vendor/*/*"" 2016-12-19 20:32:44 +00:00
Colin Cross
b3aaaea54b Revert "root.bp: Add vendor/*/*"
This reverts commit 11234b012e.

Breaks builds that have a broken symlink at vendor/*/*, which is sometimes seen in a .git directory.

Change-Id: I17041ff582d10e3f7c3fb66f20e113a9f836de45
2016-12-19 20:30:43 +00:00