Commit Graph

1786 Commits

Author SHA1 Message Date
Dan Willemsen
99b5a09022 Merge "Only add -fdebug-prefix-map on Linux hosts" 2016-03-30 04:07:54 +00:00
Colin Cross
d717c22685 Merge "Remove extension from LOCAL_MODULE_STEM" am: e925ffc
am: 9b79db3

* commit '9b79db366e7e35ce4277d4a9c11d2a0ff0847167':
  Remove extension from LOCAL_MODULE_STEM

Change-Id: I623dc4fc4ef659ac80767f6f11a566a78fa460b8
2016-03-30 01:59:13 +00:00
Colin Cross
9b79db366e Merge "Remove extension from LOCAL_MODULE_STEM"
am: e925ffc

* commit 'e925ffce03086c8654265705a7e0d3f4558ff5e9':
  Remove extension from LOCAL_MODULE_STEM

Change-Id: I57e3e2eff355235e25ff7bd46ba6213fc0e60c9b
2016-03-30 01:29:47 +00:00
Colin Cross
e925ffce03 Merge "Remove extension from LOCAL_MODULE_STEM" 2016-03-30 01:15:44 +00:00
Colin Cross
ff019aa4cf Remove extension from LOCAL_MODULE_STEM
LOCAL_MODULE_STEM adds the expected extension to the installation path,
remove the extension from the filename.

Change-Id: I54dbcfa73d8d07fc3630caf2d582160003e28f79
(cherry picked from commit bf305dea81)
2016-03-29 18:05:15 -07:00
Dan Willemsen
0c38c5ea17 Only add -fdebug-prefix-map on Linux hosts
Change-Id: I4fb865fbe40020f2d69d598491e755f793b62b7c
2016-03-29 18:03:54 -07:00
Dan Willemsen
d2d8cac61a Fix arm[64] cflags am: 110a89d
am: 21bf497

* commit '21bf497e53713c388aec040ef1730fb41b5024be':
  Fix arm[64] cflags

Change-Id: Ib9cf6d5ca13d033a7f61baac02b8ec6fd35f8a83
2016-03-30 00:53:28 +00:00
Dan Willemsen
21bf497e53 Fix arm[64] cflags
am: 110a89d

* commit '110a89d2c57a31f7e2ad7e15a70dca77167da68d':
  Fix arm[64] cflags

Change-Id: I153d142b126c03cefc10d0e02d0b239a5060d28c
2016-03-30 00:50:01 +00:00
Dan Willemsen
00c3dbbb79 Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE am: 8e1e3fb
am: 1d308c7

* commit '1d308c7737ecf990773f5bba91be8e3f7064d371':
  Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE

Change-Id: Ice9e6fa0985f5d37973221e09390de2fe618ae29
2016-03-30 00:46:13 +00:00
Dan Willemsen
1d308c7737 Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
am: 8e1e3fb

* commit '8e1e3fba871ac32087c9095127359e2e5636e554':
  Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE

Change-Id: I924948b4fa6d53f0ee083f57995cf4f467ceb74e
2016-03-30 00:42:32 +00:00
Dan Willemsen
110a89d2c5 Fix arm[64] cflags
Limit arm cpu variants to armv7-a-neon only, and handle a generic
armv7-a-neon cpu variant. Add arm64 cortex-a53 cpu variant. Sanity check
the arch variant against supported versions.

Change-Id: I8ecdea4cd36d9c82e1f29b158efc131f8b1cbc4d
2016-03-30 00:40:14 +00:00
Colin Cross
bf305dea81 Remove extension from LOCAL_MODULE_STEM
LOCAL_MODULE_STEM adds the expected extension to the installation path,
remove the extension from the filename.

Change-Id: I54dbcfa73d8d07fc3630caf2d582160003e28f79
2016-03-29 17:32:06 -07:00
Colin Cross
fb13d1b24c Revert "Remove useless LOCAL_ACP_UNAVAILABLE" DO NOT MERGE ANYWHERE
am: 27a0040  -s ours

* commit '27a0040569ee789dfedb06caa515f8c16bb67440':
  Revert "Remove useless LOCAL_ACP_UNAVAILABLE" DO NOT MERGE ANYWHERE

Change-Id: Ic831a337c85dbe81e9eda0e6f5084a8555ad9383
2016-03-30 00:32:00 +00:00
Colin Cross
f9cf41f703 Don't install static libraries
Disable installing static libraries for now by resetting the installer
when creating a static library variant.

Change-Id: I9360b5c57d95fc0712539accb9450b5fa402fade
(cherry picked from commit 7b106e4e9f)
2016-03-29 17:19:26 -07:00
Colin Cross
27a0040569 Revert "Remove useless LOCAL_ACP_UNAVAILABLE" DO NOT MERGE ANYWHERE
This reverts commit f778e12c57.

LOCAL_ACP_UNAVAILABLE is still necessary in nyc-dev.

Change-Id: I25ce63162cb30cb1b5d6173eef0f6b99298162fe
2016-03-29 17:14:54 -07:00
Dan Willemsen
8e1e3fba87 Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
Port of Id3994c6d334c8bb673fc3849550f591136a8dd6a

Change-Id: Ic9d96ff81f9119e012f45e8e3b3a76961a922a21
2016-03-29 15:47:08 -07:00
Colin Cross
04724757f1 Don\'t install static libraries
am: 7b106e4

* commit '7b106e4e9fb13e39ac9a1613a7ddeac3fef2d4b1':
  Don't install static libraries
2016-03-28 22:58:58 +00:00
Colin Cross
ec438d6c62 Manual merge of AOSP into nyc-dev
am: d27a5c8

* commit 'd27a5c8fb9ac49763e363a93cb8f3cdd0388700f':
2016-03-28 22:25:07 +00:00
Colin Cross
d27a5c8fb9 Manual merge of AOSP into nyc-dev
Change-Id: I983bae75b69e63874b6f4dd32a760c23603992fd
2016-03-25 18:08:39 -07:00
Colin Cross
7b106e4e9f Don't install static libraries
Disable installing static libraries for now by resetting the installer
when creating a static library variant.

Change-Id: I9360b5c57d95fc0712539accb9450b5fa402fade
2016-03-25 17:31:43 -07:00
Colin Cross
944beef615 Merge "Use correct install paths in generated Android.mk" 2016-03-24 22:02:12 +00:00
Dan Willemsen
eea8e6c7e1 Merge "Improve BUILDDIR handling with symlinks" 2016-03-24 20:38:08 +00:00
Colin Cross
a23446680f Use correct install paths in generated Android.mk
Extract Soong's install path and put it in the generated Android.mk file
so that tests get installed in the correct place.

Change-Id: Id4726855c5677855406de20773a5da533bdd4cea
2016-03-24 13:14:12 -07:00
Dan Willemsen
6ac18ecb84 Improve BUILDDIR handling with symlinks
If BUILDDIR is a local symlink to another directory in the same parent
directory (out -> out.angler), then using out and .. as relative paths
to get back and forth work.

But if BUILDDIR is a symlink to another directory altogether (out ->
/mnt/sdd/out.master), then we shouldn't be relying on relative paths (so
that the source directory can still be moved).

Change-Id: I946c8116090410ab2b935eafba9b6e96f5f2f1dd
2016-03-22 19:53:36 -07:00
Colin Cross
ca860ac720 Refactor cc
Refactor all of cc in order to use composition instead of inheritance.
All cc module types exported by cc are now *cc.Module objects, with
compilation, linking, and installing steps delegated to different
objects in order to form the full module type.  Additional features that
modify dependencies and flags can be inserted in a features object list,
and custom module types can be created by adding a Customizer object
that can modify properties.

Change-Id: Ie1283d14920f7856f6947b0530606b2f4d58fab0
2016-03-21 17:31:04 -07:00
Colin Cross
7253e0b8a4 Update clang version to 2690385
Matches changes in I1226f24b50319e321ea538362b2f26fcd227ca39

Change-Id: Iecb2c7388d91fe9975dbe035b5ce6fec8d32a435
2016-03-21 15:13:10 -07:00
Dan Willemsen
dc5d28ad17 Allow overriding of Clang prebuilts
These are the environment variables used by make to override the
llvm/clang prebuilts. As far as I know, these should only be used when
building or testing a new clang drop.

I would have this handled by make and put in soong.variables, but I
expect this to be one of the first options removed from make and
exported from Soong to Kati.

Change-Id: I7a3a70ee44fc4b1e56a5e200e2a7ced77d4c5692
2016-03-16 13:18:07 -07:00
Dan Willemsen
b50381684a Split Allow_missing_dependencies from Unbundled_build
There are stripped down branches used to build other things than just
unbundled apps (like the AOSP llvm branch used to build llvm prebuilts).

Change-Id: Id772eac8c4622458591b52f9f27723fdb83f9a85
2016-03-16 12:35:33 -07:00
Dan Willemsen
0f6042e317 Fix optional intermediates path for unbundled builds
On an unbundled build, if an include directory was missing, I generated
an intermediate path with PathForModuleOut. That included another copy
of $OUT_DIR, which I didn't notice. This fails if $OUT_DIR is an
absolute directory. Just manually set up the path for now.

Change-Id: I3821d562c929e69ed2fccb7e88affed384a7789e
2016-03-11 17:04:02 -08:00
Dan Willemsen
e23dfb7fdc Support missing include dirs for unbundled branches
Treat absolute paths specified from a module (include_dirs, etc) like
actual module dependencies. If it doesn't exist, produce a ninja error
instead of refusing to create the ninja file.

Change-Id: I662b9bb2af04b2006984a07d1ccb700b63dde582
2016-03-11 15:15:50 -08:00
Dan Willemsen
6553f5ef57 Propagate missing dependencies when using whole_static_libs
Currently, whole_static_libs with missing dependencies are silently
ignored. Instead, when getting the object files from the other module,
add its missing dependencies to the current module.

Change-Id: I12472dede2dfafdded56268bfd37f60063b637c4
2016-03-11 21:52:34 +00:00
Dan Willemsen
eb371e51d9 Switch to clang-2658975
Port of https://android-review.googlesource.com/206366

Change-Id: Ife2e0ab84de839ea73744cb65f995a11e3145304
2016-03-11 12:44:29 -08:00
Dan Willemsen
6fb8b8d398 OSX: Use the oldest SDK, but always set our target to 10.8
Build binaries usable on older machines even if older SDKs are not
installed. Older SDKs can no longer be installed on newer Xcode
versions.

Port of https://android-review.googlesource.com/207242

Change-Id: If66f2eef7593bce9fb858fc7b71369f55dd362e4
2016-03-09 10:41:21 -08:00
Dan Willemsen
282a4b0dda Fix C++ on Darwin
Port of https://android-review.googlesource.com/207241

Change-Id: Idad81a528a2104579de0225b0724bb81293eea44
2016-03-09 10:30:22 -08:00
Dan Willemsen
71ea9c13c9 Use optional_dirs for non-soong projects
On some branches, some of these projects may not exist. Use dirs for the
blueprint / soong projects, and optional_dirs for everything else.

Change-Id: I2b84948f1818941a21981c135bd6237852bfcc8b
2016-03-07 21:05:02 -08:00
Dan Willemsen
f3af6ce631 Merge "Replace Device_uses_{dl,je}malloc with Malloc_not_svelte" 2016-03-04 23:53:36 +00:00
Dan Willemsen
b955336d33 Swap -lm and -lpthread for host libc++ users
Match the order we use in make.

Change-Id: I7959f72841bd058b13d6c8fc6efb3c78b5de9d35
2016-03-03 19:24:03 -08:00
Dan Willemsen
99db8c30c1 Do not use -Wl,--gc-sections for linux host libraries
This matches make

Change-Id: I2ee2e47065439afa02b946ede3a7718f1a8dc71b
2016-03-03 18:09:19 -08:00
Dan Willemsen
f534a10643 Reorder extra clang host flags
In make these clang-specific flags are marked as EXTRA and added after
the common flags.

This was causing differences between compiled objects in make and soong
because -fstack-protector-strong was before -fstack-protector in soong
instead of after.

Change-Id: I59dd6dcfdaf5ec9184a09e79efe80b62cfe48dbb
2016-03-03 17:22:39 -08:00
Dan Willemsen
be03f346b3 Port GLOBAL[_CLANG]_CFLAGS_NO_OVERRIDE from make
Change-Id: I4f0f8ec7620e4477f60bf9cf1ae0c005470c89d4
2016-03-03 17:21:04 -08:00
Dan Willemsen
f778e12c57 Remove useless LOCAL_ACP_UNAVAILABLE
The make build system no longer needs LOCAL_ACP_UNAVAILABLE.

Change-Id: Ieef1415488853add9c5f5ab24219f9c6d3d13aa5
2016-03-01 23:10:25 -08:00
Dan Willemsen
52b1cd2544 Add a global define for non-external code.
Soong port of https://android-review.googlesource.com/204887

Change-Id: I15faf62cec1932dd859a082f66942b2606d0ff45
2016-03-02 03:08:37 +00:00
Dan Willemsen
4fef64b320 Merge changes Ife723733,I68acfb53,Id216c35d,Id0569831,Iadac88f8, ...
* changes:
  Add system/media/audio/include to commonGlobalIncludes
  Add -Werror=date-time to target builds
  DeviceUsesClang should default to true
  clang now supports -fdebug-prefix-map=.
  Turn on ninja errors for duplicate rules
  Update to use the latest clang-2629532
2016-03-02 03:06:41 +00:00
Dan Willemsen
f0c73e0f71 Generate .c for .y and .l
Soong port of https://android-review.googlesource.com/195737

Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
2016-03-01 17:32:31 -08:00
Dan Willemsen
97cae01e92 Replace Device_uses_{dl,je}malloc with Malloc_not_svelte
This no longer switches between dlmalloc and jemalloc, it just changes
the jemalloc cflags for non-svelte devices.

Change-Id: Ic6975de89a53a42e4735dbdcde68367ebfc42f9b
2016-03-01 17:30:59 -08:00
Dan Willemsen
98f93c77e8 Add system/media/audio/include to commonGlobalIncludes
This list now matches the make build system.

Change-Id: Ife723733f269bdcc00a0c2e9096e3e2cb7e6f88e
2016-03-01 17:22:51 -08:00
Dan Willemsen
a6084a3662 Add -Werror=date-time to target builds
Soong port of https://android-review.googlesource.com/195464

Change-Id: I68acfb53be962ffd5c488337517dadb950a13b6f
2016-03-01 17:22:44 -08:00
Dan Willemsen
0084d78abf DeviceUsesClang should default to true
It defaults to true in Make now.

Change-Id: Id216c35d4a4fc87ce19067a357561a7fc814cbbb
2016-03-01 17:22:37 -08:00
Dan Willemsen
2808e09417 clang now supports -fdebug-prefix-map=.
Soong port of https://android-review.googlesource.com/204111

Change-Id: Id0569831f09845871d8e6990c310516bea5a2510
2016-03-01 17:22:30 -08:00
Dan Willemsen
e4d7adeff5 Turn on ninja errors for duplicate rules
Change-Id: Iadac88f8835121a8685bff835acba638100bb654
2016-03-01 17:22:24 -08:00