Commit Graph

1786 Commits

Author SHA1 Message Date
Colin Cross
3e5889a791 Include bionic/Android.bp
bionic/Android.bp exists now, and subdirectories are handled with
Android.soong.mk files.

Change-Id: I70259ff5c2fb9df2f8716590502f49de1c2c8ac7
2016-05-16 16:56:51 -07:00
Dan Willemsen
8f6f30e559 Merge changes I7fd53084,I6b7a3062 am: 8911062843
am: 9c1c2f7fb8

* commit '9c1c2f7fb8ce5a41dd6cdd8e3ec87fb3fd6903fd':
  Properly export toolchain static libs
  Add more make-exported variables

Change-Id: I4ef16e3aea36ef1e0c63005061739d4e6a40648f
2016-05-16 23:54:30 +00:00
Dan Willemsen
9c1c2f7fb8 Merge changes I7fd53084,I6b7a3062
am: 8911062843

* commit '89110628436557ef0f4e851f0ad63f83cfc74652':
  Properly export toolchain static libs
  Add more make-exported variables

Change-Id: I726f23c9af9867cfa7a9920a02f1acf8b680f502
2016-05-16 23:52:06 +00:00
Treehugger Robot
8911062843 Merge changes I7fd53084,I6b7a3062
* changes:
  Properly export toolchain static libs
  Add more make-exported variables
2016-05-16 23:42:51 +00:00
Dan Willemsen
e7932e890b Properly export toolchain static libs
Change-Id: I7fd5308469aee5a43d576d1a72f7738dc6f9fbaa
2016-05-16 15:56:53 -07:00
Dan Willemsen
73d21f25cb Add more make-exported variables
Change-Id: I6b7a30624923b8ca879d4ac7a3f1f11aec9b9b8a
2016-05-16 14:22:56 -07:00
Evgenii Stepanov
06fcd04e1c Merge "USE_SAFESTACK support in Soong." am: 6e39d270fa am: ba40c3cd29
am: 7273314d93

* commit '7273314d9382aee3e7a8765a9d59b3847e14d9e3':
  USE_SAFESTACK support in Soong.

Change-Id: Ifb519b69e5ab42f35c9ad2769a1a4fe156d5da57
2016-05-16 20:29:52 +00:00
Evgenii Stepanov
7273314d93 Merge "USE_SAFESTACK support in Soong." am: 6e39d270fa
am: ba40c3cd29

* commit 'ba40c3cd295f3c2250d3cd92d1d59d694ea57f89':
  USE_SAFESTACK support in Soong.

Change-Id: I3f79ad1ab904b29d973f21475450d6d3f040d399
2016-05-16 20:27:38 +00:00
Evgenii Stepanov
ba40c3cd29 Merge "USE_SAFESTACK support in Soong."
am: 6e39d270fa

* commit '6e39d270faa8fb5656188a4ded0c419327130718':
  USE_SAFESTACK support in Soong.

Change-Id: I1b3d4fee33e1261fb328231284434dd05298ea20
2016-05-16 20:25:14 +00:00
Evgenii Stepanov
6e39d270fa Merge "USE_SAFESTACK support in Soong." 2016-05-16 20:19:39 +00:00
Dan Willemsen
3a8a55d7c1 Merge "Create empty .a on Darwin when there is no obj file." am: 1e45ef6823 am: 5a3c5a3217
am: 9ae54cfc34

* commit '9ae54cfc34825e2a299c1451af8bf9b3dbde4689':
  Create empty .a on Darwin when there is no obj file.

Change-Id: If7407bb471ecb519e4ed42821b7f2e44f6967459
2016-05-13 22:44:16 +00:00
Dan Willemsen
3da3479fa0 Don\'t use GTEST_OS_LINUX on Darwin am: 4a94683a60 am: 390657eb77
am: bd771fc737

* commit 'bd771fc7370ac710e3d1887521a92d81dfc4f74c':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: I0f2500cc32fb5e8e043bb502a7d5b77cee9f2400
2016-05-13 22:44:16 +00:00
Dan Willemsen
9ae54cfc34 Merge "Create empty .a on Darwin when there is no obj file." am: 1e45ef6823
am: 5a3c5a3217

* commit '5a3c5a32171687c2b036ca3f0f478e38859a197f':
  Create empty .a on Darwin when there is no obj file.

Change-Id: I1b3eee7a74d788f7ae9817ed700acf9a5eba8ff6
2016-05-13 22:41:42 +00:00
Dan Willemsen
bd771fc737 Don\'t use GTEST_OS_LINUX on Darwin am: 4a94683a60
am: 390657eb77

* commit '390657eb77dbadad35aaf9e34c7f5eb4320c245e':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: I2eb48ff8c5ca427c23477bbb7cf69578e1c70f9a
2016-05-13 22:41:41 +00:00
Dan Willemsen
5a3c5a3217 Merge "Create empty .a on Darwin when there is no obj file."
am: 1e45ef6823

* commit '1e45ef6823b54965d19da3a33404955d8a9a2e13':
  Create empty .a on Darwin when there is no obj file.

Change-Id: I52a972558c7fb94eb31aef8ea9146fd578a9b709
2016-05-13 22:39:09 +00:00
Dan Willemsen
390657eb77 Don\'t use GTEST_OS_LINUX on Darwin
am: 4a94683a60

* commit '4a94683a60ab44c520628f381c9cf63496b3e62e':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: I0fc3ec973a6efc849a1c476c974f9f70af2fa4b8
2016-05-13 22:39:09 +00:00
Dan Willemsen
1e45ef6823 Merge "Create empty .a on Darwin when there is no obj file." 2016-05-13 22:35:33 +00:00
Dan Willemsen
4a94683a60 Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
2016-05-13 22:28:07 +00:00
Dan Willemsen
9f0b550a15 Create empty .a on Darwin when there is no obj file.
On Darwin ar would fail if there is no object file to add.
We work around by adding a dummy.o.

Port to Soong of build/ 4aaa1a1fd8e7eb23ac5557cd326d1a48efdb54cd

Change-Id: I68bbebea2726058c25863d7026a645a520d05167
2016-05-13 15:07:37 -07:00
Dan Willemsen
e52f688242 Update gtest flags from Make am: 8146b2f1c9 am: 4faa4d6aa9
am: 37fb4d0e7c

* commit '37fb4d0e7cb2a81a1ce547b9ff2709a5a5fde0be':
  Update gtest flags from Make

Change-Id: I9401e421b34d33270e30a0ad19e8f4b54479c099
2016-05-13 21:54:46 +00:00
Dan Willemsen
37fb4d0e7c Update gtest flags from Make am: 8146b2f1c9
am: 4faa4d6aa9

* commit '4faa4d6aa9ea2b22590de26b6d4d7fc08e1d4cf4':
  Update gtest flags from Make

Change-Id: Ida3d4cff6717eaac2bfd36702533bdc6f4b8c733
2016-05-13 21:52:05 +00:00
Dan Willemsen
4faa4d6aa9 Update gtest flags from Make
am: 8146b2f1c9

* commit '8146b2f1c90cb86c488a385dc912deba6de78553':
  Update gtest flags from Make

Change-Id: I4c260b2611924815e3d0447b4f0e7cb9bd16c0b5
2016-05-13 21:48:37 +00:00
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
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
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
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
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
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
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