Commit graph

1565 commits

Author SHA1 Message Date
Dan Albert
9743874904 Merge "Add a "license" property to ndk_headers."
am: 8815351118

Change-Id: I3c2d4df9cf3085583f66cd9a60cb60b888c28eaa
2016-10-20 22:16:37 +00:00
Treehugger Robot
8815351118 Merge "Add a "license" property to ndk_headers." 2016-10-20 22:12:40 +00:00
Colin Cross
25f12d47a8 Merge changes from topic 'std'
am: 83dec15971

Change-Id: I8a6ad3991391c4f6ed16886ce89c88be06f2589c
2016-10-20 21:53:18 +00:00
Colin Cross
a985fc6186 Allow disabling gnu extensions
am: 948f0cb9ea

Change-Id: Ifca6da94a8989b3e8143f9a2573911fb49957db1
2016-10-20 21:52:43 +00:00
Colin Cross
7dc95692d4 Consolidate -std flags
am: 6f6a428760

Change-Id: I1ea0db990df17715a061a7644e8c9fb879698e49
2016-10-20 21:52:42 +00:00
Colin Cross
83dec15971 Merge changes from topic 'std'
* changes:
  Allow disabling gnu extensions
  Consolidate -std flags
2016-10-20 21:40:55 +00:00
Dan Albert
7d688c925c Merge changes I3c930d2e,I2ee3ebbf
am: a4af8ab16b

Change-Id: I882e2874b88a8809c9435b64ea8b8fd8e612fa72
2016-10-20 21:37:40 +00:00
Dan Albert
bbd06ae7fb Add a script to build the NDK prebuilts.
am: 65780b2c24

Change-Id: Ib629a2c8d966c0c1584a2eae06aea143cf761e22
2016-10-20 21:37:40 +00:00
Dan Albert
d5574e6126 Add an NDK ABIs mega build configuration.
am: 4098deb0b8

Change-Id: Ie45c12487e94351e1c042a0404ed8c0a6c2dc120
2016-10-20 21:37:39 +00:00
Treehugger Robot
a4af8ab16b Merge changes I3c930d2e,I2ee3ebbf
* changes:
  Add a script to build the NDK prebuilts.
  Add an NDK ABIs mega build configuration.
2016-10-20 21:25:33 +00:00
Colin Cross
974c9ac470 Merge "Only use -read_only_relocs on darwin x86"
am: b96f352534

Change-Id: I2bdabbcfd24e1706964d6ac97978c9d9930b9e82
2016-10-20 21:14:08 +00:00
Treehugger Robot
b96f352534 Merge "Only use -read_only_relocs on darwin x86" 2016-10-20 21:04:56 +00:00
Dan Albert
c6345fb7ec Add a "license" property to ndk_headers.
This field points to the license file for the headers being shipped.

Test: make ndk && less $SOONG_OUT/ndk/NOTICE
Bug: None
Change-Id: I386f4e6f6d9776f422ffc09b8dab69e1911b08a4
2016-10-20 13:30:07 -07:00
Colin Cross
7863cf53a8 Only use -read_only_relocs on darwin x86
Darwin x86_64 warns with -read_only_relocs:
ld: warning: -read_only_relocs cannot be used with x86_64

Only pass it for darwin x86.

Test: m -j on darwin
Change-Id: I080afb83d777587d14b60c8cd24b59005a275275
2016-10-20 10:47:21 -07:00
Dan Albert
65780b2c24 Add a script to build the NDK prebuilts.
Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          ./build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: I3c930d2ec4d73196e355b90766eb14f0f0361460
2016-10-19 14:35:15 -07:00
Dan Albert
4098deb0b8 Add an NDK ABIs mega build configuration.
The NDK needs generic prebuilts for all architectures.

Test: echo '{ "Ndk_abis": true }' > soong.config && \
          ./soong $OUT_DIR/ndk.timestamp
Bug: None

Change-Id: I2ee3ebbf4cbd1bc593f9e4e9fb44fb66711da9d5
2016-10-19 14:33:37 -07:00
Colin Cross
948f0cb9ea Allow disabling gnu extensions
Pass -std=c++14 instead of -std=gnu++14 (or whatever the current default
is) when "gnu_extensions: false" is specified in the blueprints files.

Bug: 32159540
Test: builds
Change-Id: If206228a972129d9574bcf50ddff283b7e7d3fd7
2016-10-18 12:41:17 -07:00
Colin Cross
6f6a428760 Consolidate -std flags
Define the default -std values in global.go, export them in makevars.go,
and use them in compiler.go.

Test: builds
Change-Id: Ia2ae01f63e182d0ad7f371e6d32184bff35a8897
2016-10-18 12:40:51 -07:00
Dan Willemsen
a6dd262114 Allow brillo cflags and debuggable cppflags
am: 7b872837c6

Change-Id: I606c4a8e34e635f16584585f3a03e089b81b6462
2016-10-18 04:35:15 +00:00
Dan Willemsen
7b872837c6 Allow brillo cflags and debuggable cppflags
Test: mmma -j frameworks/native/{libs/gui,opengl/libs} w/Android.bp
Change-Id: I31286c92ec4befaa486052ba2e6d55cd0d5fe62d
2016-10-17 14:50:08 -07:00
Colin Cross
64c42791f1 Re-enable prebuilt_test
am: 0d614dd222

Change-Id: I544461f21b3e794f728b84c9dd15f9d5c1644428
2016-10-15 02:05:04 +00:00
Colin Cross
0d614dd222 Re-enable prebuilt_test
Use a temporary directory as the build directory during tests so files
don't get written to the source tree.

Also add a few more tests for prebuilts with no file specified.

Bug: 31800129
Test: m -j, make sure .soong.environment is not written to the source tree
Change-Id: I623bc114b2ff534c8df9fb3ce273e804711f8f05
2016-10-14 17:07:49 -07:00
Colin Cross
258a35461f Merge "Disable prebuilt_test" am: 6efa287aea am: 9f623bf422
am: edf00545a5

Change-Id: I499effea4d25a6838f0a64e407c9a2d78f8e9f08
2016-10-14 02:53:00 +00:00
Colin Cross
edf00545a5 Merge "Disable prebuilt_test" am: 6efa287aea
am: 9f623bf422

Change-Id: I1f556b62e53dedd456797049f9f2c13e395ba311
2016-10-14 02:49:59 +00:00
Colin Cross
9f623bf422 Merge "Disable prebuilt_test"
am: 6efa287aea

Change-Id: Ida2a0758123ede4407c25133e11cb848f9f3c442
2016-10-14 02:47:30 +00:00
Treehugger Robot
6efa287aea Merge "Disable prebuilt_test" 2016-10-14 02:42:47 +00:00
Dan Willemsen
e01f62001d Export asan configuration to make am: cbceaab39c am: d2b0244c5d
am: 190d1db476

Change-Id: Ibeff03f609a9b6e08116a4ac988cf0e6a656eb59
2016-10-14 02:36:29 +00:00
Dan Willemsen
190d1db476 Export asan configuration to make am: cbceaab39c
am: d2b0244c5d

Change-Id: I2b5f21b7923cf6ff4ba8c1abb9fd2407257a6905
2016-10-14 02:31:28 +00:00
Dan Willemsen
d2b0244c5d Export asan configuration to make
am: cbceaab39c

Change-Id: I04245d14e155c3ed1cadcc87ad14efebbb7f7954
2016-10-14 02:28:28 +00:00
Colin Cross
b778a9cb4e Disable prebuilt_test
The prebuilt tests are accidentally writing a .soong.environment file to
the build/soong/android directory, disable them until TestConfig() is
fixed to prevent writing to the source tree.

Bug: 31800129
Test: m -j, make sure .soong.environment is not written to the source tree
Change-Id: I3b7d47e42111ecababe275b7a9ff0d08bcebfc7a
2016-10-13 18:09:51 -07:00
Dan Willemsen
cbceaab39c Export asan configuration to make
Test: Ninja files for ASAN'd aosp_flounder-eng identical
Change-Id: Ib29cac0bc391dadd9ff27992c7b356415182767f
2016-10-13 23:46:10 +00:00
Colin Cross
a608b797b9 Merge changes I6e84da66,Ie9e3ed09 am: 556566e5ad am: a5b861c23f
am: 2d581ad918

Change-Id: I893f772b5ba3a149cd733b81e920815cebe24411
2016-10-13 23:38:18 +00:00
Colin Cross
2050891406 Initial prebuilt support am: ce75d2c6a2 am: 2d9267aa6c
am: 6e240412aa

Change-Id: I442b67dc46988151a3f02fae4e9208cde6c93698
2016-10-13 23:38:17 +00:00
Colin Cross
3186850865 Only register mutators once am: 4498afc55b am: 1038ddd4c9
am: ce05241152

Change-Id: I285eba470067d9292de700945461471f83aefe29
2016-10-13 23:38:16 +00:00
Colin Cross
2d581ad918 Merge changes I6e84da66,Ie9e3ed09 am: 556566e5ad
am: a5b861c23f

Change-Id: I2e83e107250554e779af99397c472f1714026668
2016-10-13 23:33:18 +00:00
Colin Cross
6e240412aa Initial prebuilt support am: ce75d2c6a2
am: 2d9267aa6c

Change-Id: Ibbd81201441f7ada699ec3522d7020b95bf49a3e
2016-10-13 23:33:17 +00:00
Colin Cross
ce05241152 Only register mutators once am: 4498afc55b
am: 1038ddd4c9

Change-Id: I18c41608d639fd08a7da8ec597d4ff9ebe56552f
2016-10-13 23:33:16 +00:00
Colin Cross
a5b861c23f Merge changes I6e84da66,Ie9e3ed09
am: 556566e5ad

Change-Id: I537c6950e41528f9d609a2d208abcb755aeed6df
2016-10-13 23:30:17 +00:00
Colin Cross
2d9267aa6c Initial prebuilt support
am: ce75d2c6a2

Change-Id: I9f56b56af7380e9da90c92c2159789428547c9fa
2016-10-13 23:30:16 +00:00
Colin Cross
1038ddd4c9 Only register mutators once
am: 4498afc55b

Change-Id: Ibfec9f690be83e8997e850380e16a0a6fe3facdd
2016-10-13 23:30:15 +00:00
Treehugger Robot
556566e5ad Merge changes I6e84da66,Ie9e3ed09
* changes:
  Initial prebuilt support
  Only register mutators once
2016-10-13 23:27:32 +00:00
Colin Cross
ce75d2c6a2 Initial prebuilt support
Support prebuilt shared libraries as an initial proof-of-concept of
prebuilts.  Future changes will support binaries and static libraries,
and the ability to select which to use based on something besides
blueprint properties.

Test: TestPrebuilts run during m -j
Change-Id: I6e84da667e9005ae11844bad01d25cbe4ced1ce3
2016-10-13 14:52:47 -07:00
Colin Cross
4498afc55b Only register mutators once
Mutators are registered into a global variable, and then into the
context when it is created.  Only call registerMutators once so that the
same mutator is not listed multiple times in the global variable when
multiple contexts are created.

Test: go test -v android/soong/android
Change-Id: Ie9e3ed09a89b848462b898476cdfb81a90c64bd3
2016-10-13 14:23:17 -07:00
Elliott Hughes
457b2cf4ff Consistently use -std=gnu99 for gcc as well as clang. am: 5a0401ab9c am: 3a136c085e
am: e6836a508a

Change-Id: I94ddf3b4c4587d812b92aa745de0b65165028a64
2016-10-13 15:05:06 +00:00
Elliott Hughes
e6836a508a Consistently use -std=gnu99 for gcc as well as clang. am: 5a0401ab9c
am: 3a136c085e

Change-Id: I41234f55760561183fae448fa20d123b82ade651
2016-10-13 14:58:04 +00:00
Elliott Hughes
3a136c085e Consistently use -std=gnu99 for gcc as well as clang.
am: 5a0401ab9c

Change-Id: Id7d8165e8f59aabf15a7d8d24b294ce8beeb0a64
2016-10-13 14:50:35 +00:00
Elliott Hughes
5a0401ab9c Consistently use -std=gnu99 for gcc as well as clang.
This matters for C files that are also built for Windows. Previously they'd
be compiled with -std=gnu99 for the host but [effectively] -std=gnu89 for
Windows.

Bug: http://b/32019064
Test: builds, and can build libcrypto_utils without a manual -std= line
Change-Id: I9c5cc7832220b5c3d6a007ff10d076e26fd8c75d
2016-10-13 14:41:31 +00:00
Colin Cross
798de83c6b Add a Name property am: fc754581fc am: 8342688bca
am: 1a7847bd28

Change-Id: I0fd0694b0a8c2ee7967d3f1309ddbdf1df9be4c3
2016-10-13 03:58:01 +00:00
Colin Cross
56233ad979 Control mutator order am: 1e676bef94 am: d309a15b9d
am: e92e8abe10

Change-Id: I966513dfc19cf189896618f01d2e30d29431bffe
2016-10-13 03:58:00 +00:00
Colin Cross
1a7847bd28 Add a Name property am: fc754581fc
am: 8342688bca

Change-Id: I2013c8aadf3dacaa78a866f4178a23a00bc5aa39
2016-10-13 03:50:31 +00:00