Commit graph

1947 commits

Author SHA1 Message Date
Steven Moreland
6f10162c07 Revert "Revert "root.bp: Add vendor/*/*"" am: b527d5dfbe am: e22658812b
am: 37a589b7d8

Change-Id: I9b5c441515ae6345495400f1b45108fd280761fd
2016-12-21 18:38:04 +00:00
Steven Moreland
37a589b7d8 Revert "Revert "root.bp: Add vendor/*/*"" am: b527d5dfbe
am: e22658812b

Change-Id: Ifb02ab2f1f8d332e4af888294f43ed12be939b1d
2016-12-21 18:33:03 +00:00
Steven Moreland
e22658812b Revert "Revert "root.bp: Add vendor/*/*""
am: b527d5dfbe

Change-Id: I3c26a2adc4c7fd37b96839b36872d3549360351c
2016-12-21 18:27:03 +00:00
Dan Willemsen
2acd2fd9bf Merge "root.bp: Use system/*" am: cf767e7c9d am: 3e1f651bce
am: 88f182ade2

Change-Id: I8bff7e08a77ba9aac6d3ba173cec01223d3c8382
2016-12-20 21:00:05 +00:00
Colin Cross
01f26779ba Merge "Do not duplicate arch properties when cpu variant == arch variant" am: 5c8b8c6d6e am: be89a68cbb
am: d3c89af37f

Change-Id: I6e89a6575f8aeecdaa5dabf5e9e879abdba3c156
2016-12-20 20:59:42 +00:00
Hiroshi Yamauchi
65e405e7da Merge "Add ArtUseReadBarrier to ProductVariables." am: 6e2557fa88 am: 8b65b744ad
am: 312537ae69

Change-Id: I5dd09022a2c073bf9af0e35351687c7932fd301f
2016-12-20 20:58:46 +00:00
Dan Willemsen
88f182ade2 Merge "root.bp: Use system/*" am: cf767e7c9d
am: 3e1f651bce

Change-Id: I6987e814ce3a8df8a8a241899bccb65571a50ff8
2016-12-20 20:41:28 +00:00
Colin Cross
d3c89af37f Merge "Do not duplicate arch properties when cpu variant == arch variant" am: 5c8b8c6d6e
am: be89a68cbb

Change-Id: Id8491b518364f872088a328381904e5541a5137b
2016-12-20 20:41:08 +00:00
Hiroshi Yamauchi
312537ae69 Merge "Add ArtUseReadBarrier to ProductVariables." am: 6e2557fa88
am: 8b65b744ad

Change-Id: I4666e294585a119b1368230394c75fd8ac54c285
2016-12-20 20:40:13 +00:00
Steven Moreland
b527d5dfbe Revert "Revert "root.bp: Add vendor/*/*""
This reverts commit b3aaaea54b.

Change-Id: I8ff4424f983b259fc1c1938350aa6299f1c3f0c3
2016-12-20 20:38:15 +00:00
Dan Willemsen
3e1f651bce Merge "root.bp: Use system/*"
am: cf767e7c9d

Change-Id: Ic45ae718e713523ba18e01c39b4fc90b83d4a6a7
2016-12-20 20:33:18 +00:00
Treehugger Robot
cf767e7c9d Merge "root.bp: Use system/*" 2016-12-20 20:25:09 +00:00
Colin Cross
be89a68cbb Merge "Do not duplicate arch properties when cpu variant == arch variant"
am: 5c8b8c6d6e

Change-Id: Ibec412526fa2a1ac5176e190dee4531b8916dc06
2016-12-20 20:09:12 +00:00
Treehugger Robot
5c8b8c6d6e Merge "Do not duplicate arch properties when cpu variant == arch variant" 2016-12-20 20:01:38 +00:00
Hiroshi Yamauchi
8b65b744ad Merge "Add ArtUseReadBarrier to ProductVariables."
am: 6e2557fa88

Change-Id: I61b650dd6c80a472862d8e5273fd531c29b5d939
2016-12-20 19:04:21 +00:00
Dan Willemsen
f6a4682767 root.bp: Use system/*
Test: Soong's build.ninja identical before/after (except GlobRules)
Change-Id: I2fcdcd77083cbb49dc6b20a169964558510d91dc
2016-12-20 10:57:30 -08:00
Hiroshi Yamauchi
6e2557fa88 Merge "Add ArtUseReadBarrier to ProductVariables." 2016-12-20 18:56:20 +00:00
Colin Cross
0801633173 Do not duplicate arch properties when cpu variant == arch variant
build/make/board/generic_mips/BoardConfig.mk sets
TARGET_CPU_VARIANT := TARGET_ARCH_VARIANT, which can cause the same
variant-specific properties to be applied twice.

Test: lunch aosp_mips-eng && mmma -j external/skia TARGET_ARCH_VARIANT=mips32r2dspr2-fp
Change-Id: Ie4abe804f8ce898bf89664ae749b9bc8ac3e649f
2016-12-20 09:53:14 -08:00
Hiroshi Yamauchi
e2a106353f Add ArtUseReadBarrier to ProductVariables.
Bug: 33492005
Test: top-level angler build.
Change-Id: Ib04284bac923a143038655d495bcbacaabf61440
2016-12-19 15:31:32 -08:00
Colin Cross
e3c48137ed Merge "Revert "root.bp: Add vendor/*/*"" am: c7ebf44d65 am: 54513a4b01
am: 303fb8bd55

Change-Id: I306e755e69ad1dd6e4ccae5c00200540d4e24144
2016-12-19 20:46:42 +00:00
Colin Cross
303fb8bd55 Merge "Revert "root.bp: Add vendor/*/*"" am: c7ebf44d65
am: 54513a4b01

Change-Id: I7606e26f18a56bd0129d4ab3bdb8f2d025692122
2016-12-19 20:43:11 +00:00
Colin Cross
54513a4b01 Merge "Revert "root.bp: Add vendor/*/*""
am: c7ebf44d65

Change-Id: Id5d17d8f389354c985177ca7e1b1f2de5f6a086c
2016-12-19 20:40:11 +00:00
Colin Cross
c7ebf44d65 Merge "Revert "root.bp: Add vendor/*/*"" 2016-12-19 20:32:44 +00:00
Colin Cross
b3aaaea54b Revert "root.bp: Add vendor/*/*"
This reverts commit 11234b012e.

Breaks builds that have a broken symlink at vendor/*/*, which is sometimes seen in a .git directory.

Change-Id: I17041ff582d10e3f7c3fb66f20e113a9f836de45
2016-12-19 20:30:43 +00:00
Steven Moreland
5f6dcaac36 Merge "root.bp: Add vendor/*/*" am: 3b6dc6b56d am: 90690759dc
am: 1868cc4249

Change-Id: Id20945a51aaf6b48c46a9098d6c85b9dba201e8b
2016-12-19 19:43:38 +00:00
Steven Moreland
1868cc4249 Merge "root.bp: Add vendor/*/*" am: 3b6dc6b56d
am: 90690759dc

Change-Id: I9458463affa9cdc7f7c9b9882f1c774e95d18a81
2016-12-19 19:40:07 +00:00
Steven Moreland
90690759dc Merge "root.bp: Add vendor/*/*"
am: 3b6dc6b56d

Change-Id: I388f6a3089045c98102aefbc0a6ae7b109d24bc6
2016-12-19 19:37:08 +00:00
Treehugger Robot
3b6dc6b56d Merge "root.bp: Add vendor/*/*" 2016-12-19 19:29:43 +00:00
Colin Cross
fb7e190bee Support filegroups am: 068e0feace am: 2fd2f223c6
am: 8243c97352

Change-Id: Ia08547d2e91e0bc01cd6d2154a996bed1d7c095b
2016-12-17 17:57:28 +00:00
Colin Cross
8243c97352 Support filegroups am: 068e0feace
am: 2fd2f223c6

Change-Id: Idd45d466f515405a07e170a7b6979f3c5b106dcf
2016-12-17 17:55:59 +00:00
Colin Cross
2fd2f223c6 Support filegroups
am: 068e0feace

Change-Id: If027d78341617081b8725633059f547c38602130
2016-12-17 16:46:30 +00:00
Colin Cross
068e0feace Support filegroups
filegroup is a module that contains a list of files, and can be used
to export files across package boundaries.  filegroups (and genrules)
can be referenced from srcs properties of other modules using the
syntax ":module".

Test: m -j
Change-Id: I3d6fc4819c0b4225b474e0ad42f0d947f55a5961
2016-12-17 16:34:03 +00:00
Steven Moreland
11234b012e root.bp: Add vendor/*/*
Vendors must be able to use Android.bp files without changing root.bp.

Bug: 33672964
Test: compiles
Change-Id: I3b1d0d530d700c96ab1404b31166f10e834a1952
2016-12-16 16:40:43 -08:00
Colin Cross
b2f0a2477f Remove frameworks/base/include from the global include path am: 35e3972068 am: fcbd069c19
am: be82d8658d

Change-Id: I980f6924db8264192337948b547fcfac618962c1
2016-12-16 21:51:24 +00:00
Colin Cross
e2f04e66dd Only export exported header libs am: 32ec36c631 am: 8e46d1658b
am: 8e7f6d4bb3

Change-Id: I8782913cab67a189bb2cd4758f3eee8d31e040c3
2016-12-16 21:51:23 +00:00
Colin Cross
be82d8658d Remove frameworks/base/include from the global include path am: 35e3972068
am: fcbd069c19

Change-Id: I8bba2bcb6d12ec72344f02a4f8744aaf3c573662
2016-12-16 21:44:24 +00:00
Colin Cross
8e7f6d4bb3 Only export exported header libs am: 32ec36c631
am: 8e46d1658b

Change-Id: I77d70c3e52faa99e7f38e3bb766d1e3408d9916d
2016-12-16 21:44:23 +00:00
Colin Cross
fcbd069c19 Remove frameworks/base/include from the global include path
am: 35e3972068

Change-Id: I94c2a3d91f8b4ee5e63cac533e2ad25653afc33a
2016-12-16 21:36:55 +00:00
Colin Cross
8e46d1658b Only export exported header libs
am: 32ec36c631

Change-Id: Ieadf299b548557085a5952b16ae46f403f298b08
2016-12-16 21:36:53 +00:00
Colin Cross
35e3972068 Remove frameworks/base/include from the global include path
It is empty now.

Bug: 33630870
Test: m -j native
Change-Id: I8f41b56594241aced0f874af2fa73207b51ff8d6
2016-12-16 08:42:35 -08:00
Colin Cross
32ec36c631 Only export exported header libs
Test: m -j native
Change-Id: Ia0e5b28495e049ba8037884d2c498a1b59012bbe
2016-12-15 07:40:13 -08:00
Dan Willemsen
c4ecef7552 Merge "Export LLVM_RELEASE_VERSION" am: 1bd40ba84b am: 8886b8d7e1
am: 8a82434b84

Change-Id: Ied4649ec372b306548c82bd3fe4b38675a3caee4
2016-12-15 07:43:11 +00:00
Colin Cross
d1c4917786 Merge "Move frameworks/native/opengl/include from -isystem to -I" am: 41e6002483 am: 839c821fd3
am: 9a3fd8b3e3

Change-Id: Ie127cb287f9b8ce9e2e361667f9666064325a0ab
2016-12-15 07:42:58 +00:00
Dan Willemsen
8a82434b84 Merge "Export LLVM_RELEASE_VERSION" am: 1bd40ba84b
am: 8886b8d7e1

Change-Id: I981a3caeac9edd5af6e54fb7d7a6f3a79d339c9f
2016-12-15 07:34:43 +00:00
Colin Cross
9a3fd8b3e3 Merge "Move frameworks/native/opengl/include from -isystem to -I" am: 41e6002483
am: 839c821fd3

Change-Id: I50167170d63b196a3d84e06b5522dc49731419f8
2016-12-15 07:27:55 +00:00
Dan Willemsen
8886b8d7e1 Merge "Export LLVM_RELEASE_VERSION"
am: 1bd40ba84b

Change-Id: Id45090bf4db6eed01c88fd1ab331ff67fc2c1e7e
2016-12-15 07:27:38 +00:00
Colin Cross
839c821fd3 Merge "Move frameworks/native/opengl/include from -isystem to -I"
am: 41e6002483

Change-Id: Ica92eba46e5ecb18f20beb064c9803980aac5ea4
2016-12-15 07:20:04 +00:00
Treehugger Robot
1bd40ba84b Merge "Export LLVM_RELEASE_VERSION" 2016-12-15 07:19:03 +00:00
Treehugger Robot
41e6002483 Merge "Move frameworks/native/opengl/include from -isystem to -I" 2016-12-15 07:12:24 +00:00
Dan Willemsen
100911909c Export LLVM_RELEASE_VERSION
Test: m -j libc; check out/soong/make_vars-*.mk
Change-Id: Ic29407d8b2ecc69f8d95102bca81bec3f0c5012b
2016-12-14 16:26:48 -08:00