Commit Graph

81513 Commits

Author SHA1 Message Date
Dan Willemsen
8146b2f1c9 Update gtest flags from Make
There's a different libgtest to use for NDK libraries built with
different STLs. And we no longer need to add the gtest include path, as
it's exported.

Change-Id: I2f804cf98e074cfd4ea6b70a445e304a8a8bce50
2016-05-13 20:47:24 +00:00
Colin Cross
fb16448381 Set LOCAL_PATH for each prebuilt module am: 2630213418 am: 3f7fda3150 am: c619c9cab9
am: 4c014467d1

* commit '4c014467d10bb5d30c2818a58b82eb523c57ffce':
  Set LOCAL_PATH for each prebuilt module

Change-Id: I65b6d2f9a7203f29d3711b0e1d9fa3ba74d92b1b
2016-05-13 20:40:57 +00:00
Colin Cross
4c014467d1 Set LOCAL_PATH for each prebuilt module am: 2630213418 am: 3f7fda3150
am: c619c9cab9

* commit 'c619c9cab98f658d12ae14b609dc28dbba8c8505':
  Set LOCAL_PATH for each prebuilt module

Change-Id: I1cdd5197c1cbbd860eafaed4ea79bb57bb992208
2016-05-13 20:38:26 +00:00
Colin Cross
c619c9cab9 Set LOCAL_PATH for each prebuilt module am: 2630213418
am: 3f7fda3150

* commit '3f7fda315061ad6d91b2d1fed6f1a548305b7949':
  Set LOCAL_PATH for each prebuilt module

Change-Id: I2fbea83ef7bd0db5b65a8ccb8215b499ac96b206
2016-05-13 20:35:58 +00:00
Colin Cross
3f7fda3150 Set LOCAL_PATH for each prebuilt module
am: 2630213418

* commit '2630213418aa7523ffabfd79c8ac9de3dde53767':
  Set LOCAL_PATH for each prebuilt module

Change-Id: Ie5ebd601e7d558f5d219e8968ca189be7db92fd7
2016-05-13 20:33:29 +00:00
Evgenii Stepanov
8391efac1b USE_SAFESTACK support in Soong.
Translated into product_variables.safestack.cflags.

Change-Id: Ieb55c050448ff04793431c249f482f2d4364e67a
2016-05-13 12:44:03 -07:00
Colin Cross
2630213418 Set LOCAL_PATH for each prebuilt module
Set LOCAL_PATH to the path to the blueprint file so that make can
generate MODULE-IN-* rules to make mma work.  Switch to using
LOCAL_PREBUILT_MODULE_FILE instead of LOCAL_SRC_FILES to specify the
location of the prebuilts relative to $(TOP).

This should also make notice files work.

Change-Id: I51c7aa1187e68c4c9095687461dd5e76cbd7292d
2016-05-13 12:30:12 -07:00
Dan Willemsen
ce5f2c0621 Lock down environment variable access after all other singletons am: e8b1bc0a68 am: 88497c6866 am: 3fdde206ac
am: f2f53274c3

* commit 'f2f53274c393a54db3047b1a73886f725d286d64':
  Lock down environment variable access after all other singletons

Change-Id: I44687aaae1009c529c10a6b6b66b9053eac10d56
2016-05-13 02:21:41 +00:00
Dan Willemsen
f2f53274c3 Lock down environment variable access after all other singletons am: e8b1bc0a68 am: 88497c6866
am: 3fdde206ac

* commit '3fdde206ac5d6bdc23d3bd3991aa36f967a9e45b':
  Lock down environment variable access after all other singletons

Change-Id: Iedce767347cba2e850046d8c919a430cbeeb469f
2016-05-13 02:18:50 +00:00
Dan Willemsen
3fdde206ac Lock down environment variable access after all other singletons am: e8b1bc0a68
am: 88497c6866

* commit '88497c68662db18bdb2a7d98e72f58d01b4d604d':
  Lock down environment variable access after all other singletons

Change-Id: I9cbe15b54f550933e94c5bf2735ca6fee30ffdf0
2016-05-13 02:15:54 +00:00
Dan Willemsen
88497c6866 Lock down environment variable access after all other singletons
am: e8b1bc0a68

* commit 'e8b1bc0a689322e2d8dcc92336af606b939c67c6':
  Lock down environment variable access after all other singletons

Change-Id: I69fa02ef4ddd0e58e223328d62b07823b7e158bd
2016-05-13 02:13:30 +00:00
Dan Willemsen
e8b1bc0a68 Lock down environment variable access after all other singletons
To allow other singletons to use new environment variables, move env.go
to the end of the source list, so that its singleton is run last.

Change-Id: Ic92308f72fc0c92a0fedbc5546e337940e32eaab
2016-05-12 19:03:10 -07:00
Dan Willemsen
522acbf061 Merge "Publish Soong configuration to Make variables" am: 7f08e21941 am: ed32f1e7f5 am: 4466060a76
am: fabb789afe

* commit 'fabb789afe924a784108c0821c0f7ec7b6208156':
  Publish Soong configuration to Make variables

Change-Id: Icf7123405f7164860085c6f92cf72f498dd0b3a8
2016-05-13 01:48:43 +00:00
Dan Willemsen
fabb789afe Merge "Publish Soong configuration to Make variables" am: 7f08e21941 am: ed32f1e7f5
am: 4466060a76

* commit '4466060a7633487fa17e0baa5c60479960fe49f3':
  Publish Soong configuration to Make variables

Change-Id: I065b888888c761387626af103f21ce26eccad2a2
2016-05-13 01:46:18 +00:00
Dan Willemsen
4466060a76 Merge "Publish Soong configuration to Make variables" am: 7f08e21941
am: ed32f1e7f5

* commit 'ed32f1e7f5b7a62f253f2da385afa000d823a07a':
  Publish Soong configuration to Make variables

Change-Id: I99ed5ad02eca154454f079ca7ce281fc49dae761
2016-05-13 01:43:21 +00:00
Dan Willemsen
ed32f1e7f5 Merge "Publish Soong configuration to Make variables"
am: 7f08e21941

* commit '7f08e2194177daafbc9c103a7d3f7df1bd0903d7':
  Publish Soong configuration to Make variables

Change-Id: Icf3d49722d8d40349f9bccdccfac121d864cbe56
2016-05-13 01:40:59 +00:00
Dan Willemsen
7f08e21941 Merge "Publish Soong configuration to Make variables" 2016-05-13 01:36:28 +00:00
Evgenii Stepanov
f0493d811a Merge "Support SANITIZE_TARGET=safe-stack in soong." am: 2522660da7 am: c218cb0d65 am: 4b5685eb99
am: fa1d4a3b4c

* commit 'fa1d4a3b4c4ab31ac5385d0f1b725ea0d2dd7ea6':
  Support SANITIZE_TARGET=safe-stack in soong.

Change-Id: Ic277b1cae0e98545626767d4753e2ee8465aa306
2016-05-12 22:17:13 +00:00
Evgenii Stepanov
fa1d4a3b4c Merge "Support SANITIZE_TARGET=safe-stack in soong." am: 2522660da7 am: c218cb0d65
am: 4b5685eb99

* commit '4b5685eb995b4af3d86895fdf6825b4ae9239601':
  Support SANITIZE_TARGET=safe-stack in soong.

Change-Id: Ib783ac0537f2a971ae4801a6e554207f873fd038
2016-05-12 22:12:29 +00:00
Evgenii Stepanov
4b5685eb99 Merge "Support SANITIZE_TARGET=safe-stack in soong." am: 2522660da7
am: c218cb0d65

* commit 'c218cb0d6536a209a14e32e43b612e4c8afadaf9':
  Support SANITIZE_TARGET=safe-stack in soong.

Change-Id: Ibb70f79bfdf45a3d15171d5161b5d067236582c8
2016-05-12 22:07:08 +00:00
Evgenii Stepanov
c218cb0d65 Merge "Support SANITIZE_TARGET=safe-stack in soong."
am: 2522660da7

* commit '2522660da7fa8039176842e5e353a57e7f1d7772':
  Support SANITIZE_TARGET=safe-stack in soong.

Change-Id: I8ce38996f44c4696aa0f2847d81c5b1ea773648e
2016-05-12 22:03:57 +00:00
Evgenii Stepanov
2522660da7 Merge "Support SANITIZE_TARGET=safe-stack in soong." 2016-05-12 21:59:25 +00:00
Dan Willemsen
6de9c9cb93 Merge "Include objs from whole static libs before local objs" am: 0414479ba4 am: 16d5bf282a am: 74e6c8878d
am: e5ca524e3e

* commit 'e5ca524e3e9d01a7734402ca2a1731ff50e599d3':
  Include objs from whole static libs before local objs

Change-Id: I5fca22cb9bda1ea8844a84d8da0cf2a694a3184a
2016-05-12 21:21:07 +00:00
Dan Willemsen
e5ca524e3e Merge "Include objs from whole static libs before local objs" am: 0414479ba4 am: 16d5bf282a
am: 74e6c8878d

* commit '74e6c8878d6f0ee104a9d11f7c36624160567140':
  Include objs from whole static libs before local objs

Change-Id: Id5e2cf6a0bda95a47f371b8e46501820830f06d2
2016-05-12 21:18:46 +00:00
Dan Willemsen
74e6c8878d Merge "Include objs from whole static libs before local objs" am: 0414479ba4
am: 16d5bf282a

* commit '16d5bf282a5678d44f4fec8b71087cba4dae9b7d':
  Include objs from whole static libs before local objs

Change-Id: Ib298cf234b192fed67bc81d0a3bbb317a073bce7
2016-05-12 21:16:31 +00:00
Dan Willemsen
16d5bf282a Merge "Include objs from whole static libs before local objs"
am: 0414479ba4

* commit '0414479ba4f26598a5557d2334b9f5ec58c772f8':
  Include objs from whole static libs before local objs

Change-Id: I6421441336f37cbc165ff0eff652284e917eb8ca
2016-05-12 21:13:41 +00:00
Treehugger Robot
0414479ba4 Merge "Include objs from whole static libs before local objs" 2016-05-12 21:06:57 +00:00
Evgenii Stepanov
0a8a0d09d1 Support SANITIZE_TARGET=safe-stack in soong.
Change-Id: I570a7033ece82c5e76815dc1b81622b481930de4
2016-05-12 13:54:53 -07:00
Dan Willemsen
f99267b36e Support custom suffixes on Makefile outputs am: 174978cc58 am: 8c24aa647d am: bd2e0ddd54
am: 36fbefbae4

* commit '36fbefbae40cf289e9b0a65c2b87fc2e58f6e75a':
  Support custom suffixes on Makefile outputs

Change-Id: I8b8bbb6fa8e5f2bcc8136bdc8f39877baa138ca5
2016-05-12 20:53:36 +00:00
Dan Willemsen
36fbefbae4 Support custom suffixes on Makefile outputs am: 174978cc58 am: 8c24aa647d
am: bd2e0ddd54

* commit 'bd2e0ddd546cbeec685cf850f695f6d949578e96':
  Support custom suffixes on Makefile outputs

Change-Id: Ic1fe98a33163ef65ed7fbd01d9f167d1f07df176
2016-05-12 20:49:03 +00:00
Dan Willemsen
bd2e0ddd54 Support custom suffixes on Makefile outputs am: 174978cc58
am: 8c24aa647d

* commit '8c24aa647d17cd526798920f781d22bb419001d4':
  Support custom suffixes on Makefile outputs

Change-Id: I7e06a5360b50a202a60a98f972c31d3477cb1454
2016-05-12 20:46:44 +00:00
Dan Willemsen
8c24aa647d Support custom suffixes on Makefile outputs
am: 174978cc58

* commit '174978cc5834844517fc58f396561f2b24f3a169':
  Support custom suffixes on Makefile outputs

Change-Id: I605bab05736bd44c988cb9fa752ca0d78327db3d
2016-05-12 20:44:06 +00:00
Dan Willemsen
4b7d5deb84 Publish Soong configuration to Make variables
For configuration like TARGET_GLOBAL_CFLAGS, it would be good to have
Make and Soong use the same values. This change adds an interface for
packages like cc to verify the current value of make variables match the
Soong equivalents, and once they're satisfied with the results, remove
the make definition and use the value from Soong.

The cc implementation exports a few variables currently that I expect to
match between both implementations in all cases. It also checks
{CLANG,}{HOST,TARGET}_GLOBAL_{C,LD}FLAGS, which should be mostly similar
between make and soong now.

Bug: 23566674
Change-Id: Idc8582ef31ace11a8baefcf525c3683f08a573aa
2016-05-12 13:36:55 -07:00
Dan Willemsen
025b4807cb Include objs from whole static libs before local objs
This matches the make behavior.

Change-Id: I8265fb481424734062b0fca944cdbbe283b7236d
2016-05-12 13:20:52 -07:00
Dan Willemsen
174978cc58 Support custom suffixes on Makefile outputs
This way Make can use different output files for different targets, and
switch between them without having to reparse all the makefiles.

Change-Id: I00001a09d79025772d966f443ab9f130e35f4720
2016-05-11 00:38:00 -07:00
Dan Willemsen
06984c2d96 Merge "Move local ldflags after the toolchain ldflags" am: ac6697420a am: dbec7035e6 am: 3040e468aa
am: 92fac77f74

* commit '92fac77f74eeba1b2882eee3aa49ab110b2e2c48':
  Move local ldflags after the toolchain ldflags

Change-Id: Ib8c56bacc1003ca0fbf93933003e2d8ccfe11d08
2016-05-11 01:41:26 +00:00
Dan Willemsen
92fac77f74 Merge "Move local ldflags after the toolchain ldflags" am: ac6697420a am: dbec7035e6
am: 3040e468aa

* commit '3040e468aacf8bb5a70735f34501f51138512870':
  Move local ldflags after the toolchain ldflags

Change-Id: I3be4f2785b534f32fead6683663c32d21ddeef12
2016-05-11 01:38:31 +00:00
Dan Willemsen
3040e468aa Merge "Move local ldflags after the toolchain ldflags" am: ac6697420a
am: dbec7035e6

* commit 'dbec7035e65478ad90cdcc1c6c51f311496857fe':
  Move local ldflags after the toolchain ldflags

Change-Id: Ifda0258475e10db95a517801dd02102b2760d31f
2016-05-11 01:36:01 +00:00
Dan Willemsen
dbec7035e6 Merge "Move local ldflags after the toolchain ldflags"
am: ac6697420a

* commit 'ac6697420aebc6e7f98d5a73c8d4c525bf8de419':
  Move local ldflags after the toolchain ldflags

Change-Id: I4c2a0173026f86a215749b3031ae5da49b2ca0f9
2016-05-11 01:33:18 +00:00
Treehugger Robot
ac6697420a Merge "Move local ldflags after the toolchain ldflags" 2016-05-11 01:27:50 +00:00
Dan Willemsen
9483cca8c4 Add a 32-bit x86_64 arch variant am: 8a35405d33 am: 90473092fe am: 7e06e537e5
am: 5e1d8e538e

* commit '5e1d8e538e37b7adc142cd6cf6d2fe8f26ce39f6':
  Add a 32-bit x86_64 arch variant

Change-Id: I45edc64981e09fc477c4ba3b6d84722fdbf42e04
2016-05-11 00:54:45 +00:00
Dan Willemsen
5e1d8e538e Add a 32-bit x86_64 arch variant am: 8a35405d33 am: 90473092fe
am: 7e06e537e5

* commit '7e06e537e52ad65252b7ec921efcfd079ee04940':
  Add a 32-bit x86_64 arch variant

Change-Id: I85c7d4348702abdd283a74cb38cf93d5e69e8b01
2016-05-11 00:52:09 +00:00
Dan Willemsen
7e06e537e5 Add a 32-bit x86_64 arch variant am: 8a35405d33
am: 90473092fe

* commit '90473092fe4e45aa8d965b73adf4896584b46df5':
  Add a 32-bit x86_64 arch variant

Change-Id: Ia147534c57561150b1862acbc9f1c44c2450e97e
2016-05-11 00:49:32 +00:00
Dan Willemsen
90473092fe Add a 32-bit x86_64 arch variant
am: 8a35405d33

* commit '8a35405d330ed9f69f6a34ca6d5e75ccc2c64540':
  Add a 32-bit x86_64 arch variant

Change-Id: Ic4def22a1957fd48732fa3ad1237583c473315d3
2016-05-11 00:46:57 +00:00
Dan Willemsen
00ced7675c Move local ldflags after the toolchain ldflags
This way a local module can override a global flag (like libm
overriding -Wl,--hash-style=)

Change-Id: If32774381fc46b5767f2c13bf45c3a84acb2697e
2016-05-10 17:31:21 -07:00
Dan Willemsen
8a35405d33 Add a 32-bit x86_64 arch variant
In make, the current 32-bit configuration for generic x86_64 targets
inherits some variables (SSE4 support) from the 64-bit configuration,
and overrides the make variables used for other configurations (SSSE3).

We don't have that problem in Soong, but this is the configuration
matching what Make is using.

Change-Id: Ia934ff40f9388f9c202a0fe0608e7b45b77a2714
2016-05-10 15:29:33 -07:00
Dan Willemsen
2accdc8c1f Merge "Fix X86 flags" am: f4449451b5 am: 173aad1a97 am: 37fb017ce4
am: c15f1d87f4

* commit 'c15f1d87f430cfa2f9f5d5ea9a6153bfdc379b34':
  Fix X86 flags

Change-Id: If9437189dbabf5894ac0eb7e7250d2dd158ae95d
2016-05-10 00:37:38 +00:00
Dan Willemsen
9a95649934 Merge "Fix mips flags" am: 2524b414e2 am: f1c2e9bb13 am: 6a2e4c45c1
am: d23f48a65f

* commit 'd23f48a65fba5e21384239599063060251b07c13':
  Fix mips flags

Change-Id: Iab851ede063e6658a3cd4af08f75786fa61083ca
2016-05-10 00:37:37 +00:00
Dan Willemsen
cbf090eb66 Clean up and fix Krait cflags am: ed89a7aa0c am: 2410d7b74e am: f13fe60ea9
am: fd9de60573

* commit 'fd9de60573ab07bb840fd22baa1f5aaeb65a7af0':
  Clean up and fix Krait cflags

Change-Id: I4fe66a90254c4e20b6b4437011d0ade52447341b
2016-05-10 00:37:36 +00:00
Dan Willemsen
c15f1d87f4 Merge "Fix X86 flags" am: f4449451b5 am: 173aad1a97
am: 37fb017ce4

* commit '37fb017ce4db41f2a3aea747656ba4ecacd28936':
  Fix X86 flags

Change-Id: I09b4acbffd19c8a0593a16b7c8b2fd9de11eeca5
2016-05-10 00:31:36 +00:00