Commit graph

255 commits

Author SHA1 Message Date
Colin Cross
06a931bdb6 Replace extendProperties with pathtools.AppendProperties
Blueprint has a generic AppendProperties/AppendMatchingProperties now,
use it, and replace all bool properties that might be modified by a
mutator with *bool, which provides the correct replace-if-set semantics
for append.

Also remove uses of ContainsProperty except when explicitly checking if
a property was set in a blueprints file.

Change-Id: If523af61d6b4630e79504d7fc2840f36e98571cc
2015-11-03 15:46:08 -08:00
Colin Cross
7449857325 Update build.ninja.in for blueprint changes
Change-Id: I54da2f7802dcb06c6c40ca496c9efbb1d749361f
2015-11-03 14:49:06 -08:00
Dan Willemsen
6d11dd87c0 cc: Filter out unknown clang cflags from InstructionSetFlags
-funswitch-loops is in the arm instruction set flags, but unsupported by
clang. Make removes clang unknown cflags from the instruction set flags.
This was producing a warning, causing -Werror to fail on libm.

Change-Id: Ibc69c9af04a738aa8adeb5549900e2b53ab754f0
2015-11-03 14:30:12 -08:00
Colin Cross
6d27f3428e Fix gofmt
Change-Id: Idce816555f5d785a401f876f899af29b98c9c064
2015-10-28 17:23:16 -07:00
Dan Willemsen
e65404514c Updates from make
Contains equivalent changes for:

  561b4c1 Set mcpu targets based on cpu variant.
  6a66a88 Stop encoding absolute paths in symbols
  63e3b02 Enable color output from gcc and clang
  eb3e3fa Use exported includes for libc++.
  3a0a891 Link libgtest_main before libgtest

Change-Id: I45a06c02e9af1d40f0c52f1e6a20d6cd382a27fb
2015-10-20 16:44:55 -07:00
Dan Willemsen
dd0e2c338f Add DeviceUsesClang to change clang default
This is equivalent to USE_CLANG_PLATFORM_BUILD in the current build
system.

Change-Id: Ifaca0f2639871dac834ef603cfade695191cff11
2015-10-20 14:29:35 -07:00
Dan Willemsen
60c3dfb19a Add cortex_a53_64 and cortex_a53_a57
Renames cortex_a53 to cortex_a53_64, since we need to set options for
both. Also adds the cortex_a53_a57 big/little configuration.

Change-Id: Ia0e8104867f9aed7cbf5be8be1ead6ddc30c42c4
2015-10-16 17:29:12 -07:00
Dan Willemsen
96dc9f3f4a Fix X86_SSE3 -> X86_SSSE3
Change-Id: Ic89e13560e88920b133fab349e7c035b8fbea99f
2015-10-16 16:31:15 -07:00
Dan Willemsen
fa4d33f452 am 83285cec: Merge "Add ProductVariables.DeviceName, set defaults to flounder"
* commit '83285cec5f854c3e0fc91b51a39e1a69a058093f':
  Add ProductVariables.DeviceName, set defaults to flounder
2015-09-24 20:05:16 +00:00
Dan Willemsen
0417f1db7e am 1e898b9e: cc: Use local_include_dirs before include_dirs
* commit '1e898b9e04d85de7274c0cad3e8752b16196c100':
  cc: Use local_include_dirs before include_dirs
2015-09-24 20:05:14 +00:00
Dan Willemsen
83285cec5f Merge "Add ProductVariables.DeviceName, set defaults to flounder" 2015-09-24 20:00:59 +00:00
Dan Willemsen
1d31ec3667 Add ProductVariables.DeviceName, set defaults to flounder
Using flounder defaults to compare against make.

Change-Id: I88fb0809e84b78ef005b76f255017a4d4a35fd13
2015-09-23 15:31:39 -07:00
Dan Willemsen
1e898b9e04 cc: Use local_include_dirs before include_dirs
Prefer local headers over remote headers

Change-Id: Ic50104c5f2cfdd96cd749d35c52cd13706ac6367
2015-09-23 15:31:08 -07:00
Dan Willemsen
c01250ef5b am e9862da7: Update build.ninja.in for blueprint update
* commit 'e9862da7dd8d9911d26472248294069ba4f3e515':
  Update build.ninja.in for blueprint update
2015-09-19 19:52:40 +00:00
Dan Willemsen
e9862da7dd Update build.ninja.in for blueprint update
Change-Id: I71df8cd5f628855072f1a07e2be150d3e022344a
2015-09-18 12:48:44 -07:00
Colin Cross
27a4c1f256 am 2738597a: Fix product variables with no soong.variables
* commit '2738597af04d3795434dea7637528d5a63e4aff3':
  Fix product variables with no soong.variables
2015-09-18 19:39:22 +00:00
Colin Cross
2738597af0 Fix product variables with no soong.variables
If soong.variables didn't exist, loadFromConfigFile would write default
values to soong.variables, but return with the product variables set to
the zero values.  Replace jsonConfigurable.DefaultConfig() with
SetDefaultConfig() that modifies the current object, and call it before
writing the values.

Change-Id: I7b7404c7a51975dc4493e25c775b3cf56ef335e3
2015-09-18 10:59:41 -07:00
Dan Willemsen
26ca1fdca1 am 33c4578b: Merge "Use SRCDIR as a working directory"
* commit '33c4578b5f2fe9a7ba058d704c1f47690783ee63':
  Use SRCDIR as a working directory
2015-09-18 06:54:19 +00:00
Dan Willemsen
33c4578b5f Merge "Use SRCDIR as a working directory" 2015-09-18 06:48:57 +00:00
Dan Willemsen
87b17d1ff4 Use SRCDIR as a working directory
The existing behavior of using the build directory as the working
directory is useful if you want to move/copy the output directory around
and SRCDIR still refers the the source. But, it's more useful to have
the source directory be the working directory. Tools like cpp(__FILE__)
and other debug prints embed relative paths from the working directory.
We also have tools that expect the working directory to be $TOP.

Change-Id: Ia0f1d3c6b7df72d61cf5628efa2baa98bd19775b
2015-09-17 23:42:25 -07:00
Colin Cross
76c62b912d am 05d6f67f: Merge "Set host and device arches from product variables"
* commit '05d6f67ff75c319e4abe2d70984872f4b8407ac1':
  Set host and device arches from product variables
2015-09-18 01:02:28 +00:00
Colin Cross
05d6f67ff7 Merge "Set host and device arches from product variables" 2015-09-18 00:55:59 +00:00
Colin Cross
ffe6a381e2 am c3ba6cb9: Merge "Make Test_per_src a property on all binaries"
* commit 'c3ba6cb9707730e0fc553fa86b9fe6b6c9bbb4b9':
  Make Test_per_src a property on all binaries
2015-09-17 22:44:56 +00:00
Colin Cross
c3ba6cb970 Merge "Make Test_per_src a property on all binaries" 2015-09-17 22:34:04 +00:00
Colin Cross
4225f65920 Set host and device arches from product variables
Read the host and device arches from soong.variables.

Bug: 23567214
Change-Id: Ie44db4dcf431a4c7dddcdc26117d4daa734c1f67
2015-09-17 15:21:42 -07:00
Colin Cross
6002e056fd Make Test_per_src a property on all binaries
Change-Id: I36b84807cac3d8fd7ef50c8ffb8e2a85ddc10509
2015-09-17 15:21:42 -07:00
Dan Willemsen
c6d5fa58c4 am 550eb33a: Update build.ninja.in for go 1.5
* commit '550eb33aa5dae1616118b99480eb216b0f133e94':
  Update build.ninja.in for go 1.5
2015-09-17 21:39:50 +00:00
Dan Willemsen
550eb33aa5 Update build.ninja.in for go 1.5
Change-Id: I7a5b3cba2335fbc61b308ad4acc5148b4bd0a97f
2015-09-17 14:16:32 -07:00
Dan Willemsen
9c73419dc0 am 47cf66b8: Add platform_sdk_version product variable
* commit '47cf66b8d1b9e479ab87b54403480cb39e3acae8':
  Add platform_sdk_version product variable
2015-09-17 00:49:31 +00:00
Dan Willemsen
47cf66b8d1 Add platform_sdk_version product variable
For libc to use

Change-Id: I5048509e27ea4e4dc7773e7bd33e7f7b4deca608
2015-09-16 16:48:54 -07:00
Dan Willemsen
0a62ffdfe1 am cde6dce0: Merge "Allow \'sanitize\' to be arch-specific."
* commit 'cde6dce0268251e015b79efd9e20d6395298b391':
  Allow 'sanitize' to be arch-specific.
2015-09-16 23:08:31 +00:00
Dan Willemsen
a939dfcd2b am 0eeea1e6: Merge "Port LOCAL_NO_LIBGCC from make"
* commit '0eeea1e6f2a3f3f9d6d4208f756415e433878266':
  Port LOCAL_NO_LIBGCC from make
2015-09-16 23:08:30 +00:00
Dan Willemsen
cde6dce026 Merge "Allow 'sanitize' to be arch-specific." 2015-09-16 23:04:19 +00:00
Dan Willemsen
0eeea1e6f2 Merge "Port LOCAL_NO_LIBGCC from make" 2015-09-16 23:04:07 +00:00
Dan Willemsen
9e0cb35c29 Allow 'sanitize' to be arch-specific.
The usecase here is system/core/liblog, which wants to turn off
sanitizer only for the target module, since the target sanitizers depend
on liblog.

Change-Id: I99141574a1c4c4847aa8a72bdcc88901fd9b01cd
2015-09-16 15:41:55 -07:00
Dan Willemsen
d67be22400 Port LOCAL_NO_LIBGCC from make
Change-Id: Iba400de882547654b2a5184d420e38113d7545ee
2015-09-16 15:20:36 -07:00
Colin Cross
e2946615e7 am a6bc19e4: Check that a product variable is set
* commit 'a6bc19e415cf96e6060692b5d538a7a76a270353':
  Check that a product variable is set
2015-09-16 21:48:41 +00:00
Colin Cross
480e8f503e am b43a159c: Replace asan with sanitize
* commit 'b43a159c13c47495d64089821f6b0bfd49ebd237':
  Replace asan with sanitize
2015-09-16 21:48:40 +00:00
Colin Cross
a6bc19e415 Check that a product variable is set
Store product variables in pointers so that we can only apply the
properties if the product variable was set to a value.  Also only apply
bool properties if they are true, adn rearrange the code to do the
cheapest checks first.

Remove device_uses_logd, it doesn't exist any more.

Change-Id: Icf42408f57bd611746f8d985bfceb50c7f95ea59
2015-09-16 14:19:55 -07:00
Colin Cross
b43a159c13 Replace asan with sanitize
LOCAL_ADDRESS_SANITIZER has been replaced with LOCAL_SANITIZE.

Change-Id: I81fe7e0c9135cfd4a222fae4012ab5082cc58f29
2015-09-16 14:19:55 -07:00
Dan Willemsen
ff7293e832 am 8a12ccd2: Merge "Freeze environment reading after saving deps"
* commit '8a12ccd282f6d64266bb487d247305df48487f53':
  Freeze environment reading after saving deps
2015-09-16 00:02:33 +00:00
Dan Willemsen
8a12ccd282 Merge "Freeze environment reading after saving deps" 2015-09-15 23:57:07 +00:00
Dan Willemsen
7c684e2ac4 am f8e98b08: Add libbenchmark\'s new dependency on libbase.
* commit 'f8e98b0804ffa468f04fe7ff77c78371e9aba774':
  Add libbenchmark's new dependency on libbase.
2015-09-15 23:10:23 +00:00
Dan Willemsen
9ec56e2bb8 am fa3924e4: Disallow using stlport.
* commit 'fa3924e4801bb03d7a285a64463b824e9a532990':
  Disallow using stlport.
2015-09-15 23:10:22 +00:00
Dan Willemsen
53e4e36831 am 3bf6b472: Update flags to match make
* commit '3bf6b472299efa1a0e666010d68351bae949f826':
  Update flags to match make
2015-09-15 23:10:21 +00:00
Dan Willemsen
e60e8fe3ab am c3c75569: Merge "Add cortex-a53 cpu variant"
* commit 'c3c755692407b0db44122eceefc0deda8bc664f3':
  Add cortex-a53 cpu variant
2015-09-15 23:10:20 +00:00
Colin Cross
cccecd7f91 am 2e238cfa: Merge "Add support for include_files"
* commit '2e238cfa31c8813809f8998100d1efe24b60473e':
  Add support for include_files
2015-09-15 23:09:46 +00:00
Dan Willemsen
f8e98b0804 Add libbenchmark's new dependency on libbase.
See https://android-review.googlesource.com/150583

Change-Id: I6f9700b3e51a3b681d3d91b88103eed31764f61e
2015-09-15 22:21:47 +00:00
Dan Willemsen
fa3924e480 Disallow using stlport.
See https://android-review.googlesource.com/149486

Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
2015-09-15 22:21:16 +00:00
Dan Willemsen
3bf6b47229 Update flags to match make
Change-Id: I8ba24723d5b507fa178255c124b11356719700cb
2015-09-15 22:20:03 +00:00