Commit Graph

603 Commits

Author SHA1 Message Date
Dan Willemsen
3b4aae8a23 Export -D__BRILLO__ to make if necessary am: 06f453359a am: da8b053323
am: 224361ead4

* commit '224361ead4ff8a831eb1df781d4a39093f4e40aa':
  Export -D__BRILLO__ to make if necessary

Change-Id: Ie77dc5ee2480c25f0ed9deb13a09db996e6830a2
2016-05-17 02:45:45 +00:00
Dan Willemsen
224361ead4 Export -D__BRILLO__ to make if necessary am: 06f453359a
am: da8b053323

* commit 'da8b0533239d35ea5e82d11624c4c7820bbf66e0':
  Export -D__BRILLO__ to make if necessary

Change-Id: Iaeb3018c7f8666037d596b4f0917686a435b43fb
2016-05-17 02:43:32 +00:00
Dan Willemsen
da8b053323 Export -D__BRILLO__ to make if necessary
am: 06f453359a

* commit '06f453359a6686e20d00e7ab661e39ce0e0e5bb5':
  Export -D__BRILLO__ to make if necessary

Change-Id: I0b5236fe6a32c52e00e50d88b99928a1ad4ef6ad
2016-05-17 02:41:00 +00:00
Dan Willemsen
06f453359a Export -D__BRILLO__ to make if necessary
Fixes Brillo builds

Change-Id: Ia3563b0c9e000d95ed18d05460f5c8c32e04e191
2016-05-16 19:32:33 -07:00
Dan Willemsen
44cc025401 Turn on strict checking for C[PP]FLAGS make vars am: b436fdee65 am: fb2eaaf8f2
am: a5f997fa39

* commit 'a5f997fa39fe56de414e773b0ebee287571d83b6':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: I1380124d2533e687bed4429d08932ea7464e3f74
2016-05-17 02:11:12 +00:00
Dan Willemsen
5e9acd18c2 Don\'t use -B...gcc.. on Darwin am: 3772da13fd am: aaaeb15c73
am: fc8fa79a7f

* commit 'fc8fa79a7f44548f01fd48bc710d4cc3795f9953':
  Don't use -B...gcc.. on Darwin

Change-Id: Id7a487d43b9d54e10f31f4ce3e8b2ee490321c44
2016-05-17 02:11:12 +00:00
Dan Willemsen
a5f997fa39 Turn on strict checking for C[PP]FLAGS make vars am: b436fdee65
am: fb2eaaf8f2

* commit 'fb2eaaf8f2cf111cf76937bd10e2cf6d5901f122':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: I6467f06c78886700089203f829ad30ede6a222af
2016-05-17 02:08:21 +00:00
Dan Willemsen
fc8fa79a7f Don\'t use -B...gcc.. on Darwin am: 3772da13fd
am: aaaeb15c73

* commit 'aaaeb15c7396f5454ab72a37f190ab5b9003e13b':
  Don't use -B...gcc.. on Darwin

Change-Id: I150c7aa6df8fcc895d4b5cf21f9e90e5c1b1b1f4
2016-05-17 02:08:20 +00:00
Dan Willemsen
fb2eaaf8f2 Turn on strict checking for C[PP]FLAGS make vars
am: b436fdee65

* commit 'b436fdee65b2ae27576b37f1f13a324bc9c7f51a':
  Turn on strict checking for C[PP]FLAGS make vars

Change-Id: If75cd0402c85326307ef6d1657c3f8153f904a38
2016-05-17 02:05:51 +00:00
Dan Willemsen
aaaeb15c73 Don\'t use -B...gcc.. on Darwin
am: 3772da13fd

* commit '3772da13fd9b4d1f0aec35c73883c1cb5b60fd35':
  Don't use -B...gcc.. on Darwin

Change-Id: Iad450b34cc85054b573ec0c2b8537414def9ef52
2016-05-17 02:05:50 +00:00
Dan Willemsen
b436fdee65 Turn on strict checking for C[PP]FLAGS make vars
Change-Id: I8448feb55b54515856798c1b3e8070d0e07e0b6c
2016-05-16 18:04:45 -07:00
Dan Willemsen
3772da13fd Don't use -B...gcc.. on Darwin
We don't ship binutils on Darwin, so there is no point in telling clang
to look in that path. (The path being used doesn't even exist). This
matches the Make behavior.

Change-Id: I663047057ff8df8a349483532da8018af13d50d8
2016-05-16 18:04:01 -07:00
Colin Cross
ca13185875 Merge "Include bionic/Android.bp" am: 88c4750c51 am: 1004805108
am: 2729765903

* commit '27297659037a15ef5cbc2cb5eaa7588323d9162f':
  Include bionic/Android.bp

Change-Id: I7a8e808170daac52847e620e60235262f636d799
2016-05-17 01:02:08 +00:00
Colin Cross
2729765903 Merge "Include bionic/Android.bp" am: 88c4750c51
am: 1004805108

* commit '100480510886bfc5989e63324745f837cf9d4341':
  Include bionic/Android.bp

Change-Id: Icb1f4b6041e78ef0ef6a261934457ea50e16060a
2016-05-17 00:55:53 +00:00
Colin Cross
1004805108 Merge "Include bionic/Android.bp"
am: 88c4750c51

* commit '88c4750c518f3910725f74295d21286291551f5d':
  Include bionic/Android.bp

Change-Id: Id61be2e4e7e5f92747e67bccceae741dcd99336f
2016-05-17 00:52:30 +00:00
Colin Cross
88c4750c51 Merge "Include bionic/Android.bp" 2016-05-17 00:42:17 +00:00
Dan Willemsen
53c30c05df Merge changes I7fd53084,I6b7a3062 am: 8911062843 am: 9c1c2f7fb8
am: 8f6f30e559

* commit '8f6f30e55953c576cb4edfcce50cf1c77eed71a1':
  Properly export toolchain static libs
  Add more make-exported variables

Change-Id: Ic4ac5ce44b1ae5b2e87ea5434577bcba37438579
2016-05-16 23:57:03 +00:00
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