openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,756 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

1756 Commits

Author SHA1 Message Date
Colin Cross f3da303b51 Merge "Ninja and shell escape command line flags" 
am: 12013c8fe6

Change-Id: I104dc23636f4caf2942dbf47d8f8ba560bcdb406
 2016-09-30 04:21:17 +00:00
Treehugger Robot 12013c8fe6 Merge "Ninja and shell escape command line flags" 2016-09-30 04:17:59 +00:00
Dan Willemsen 3dea1e4e79 Handle dependencies with export_generated_headers am: 847dcc7d2a am: beb9903058 
am: 7f7b05ada1

Change-Id: I5f3e9fc3ec55a22cbad8ae9484355d876998af5c
 2016-09-30 01:48:30 +00:00
Dan Willemsen 7f7b05ada1 Handle dependencies with export_generated_headers am: 847dcc7d2a 
am: beb9903058

Change-Id: Ia9ed4677020aa76de79c51c945d80db165b5ca76
 2016-09-30 01:46:32 +00:00
Dan Willemsen beb9903058 Handle dependencies with export_generated_headers 
am: 847dcc7d2a

Change-Id: I968eb6c870b9ed157c4f76bebd59fc7f9245b7c5
 2016-09-30 01:44:01 +00:00
Dan Willemsen 847dcc7d2a Handle dependencies with export_generated_headers 
This sets up the proper dependencies within Soong by adding the imported
dependencies into GeneratedHeaders, and re-exporting them as necessary.
It also exports them to Make using the new LOCAL_EXPORT_C_INCLUDE_DEPS.

Bug: 31742855
Test: Inspection, build hardware/interfaces (pending)
Change-Id: I6a10ceec377a97966baa9d4876b90fcda391dd01
 2016-09-30 01:37:38 +00:00
Colin Cross 4b963f8d6a Ninja and shell escape command line flags 
Strings like cflags in Android.bp files are parsed by blueprint,
written to build.ninja files, parsed by ninja, and then passed to
/bin/sh -c.  This had resulted in a combination of blueprint
(\"), ninja ($$), and shell (\$) escaping being necessary.

Update Soong to automatically handle ninja and shell escaping in
cflags and ldflags.

Bug: 31221587
Test: m -j
Change-Id: Ibe087b2788b355b73c3225b5928870619a0a53bc
 2016-09-29 15:57:59 -07:00
Dan Willemsen 6d31717316 Trigger binary installation in Soong from Make am: 03ce63eaa6 am: f9a8e25486 
am: 13e53fd9c1

Change-Id: I1a9c0e51aa5eb003b907ab0db9f138049efc0628
 2016-09-29 22:53:16 +00:00
Dan Willemsen 13e53fd9c1 Trigger binary installation in Soong from Make am: 03ce63eaa6 
am: f9a8e25486

Change-Id: I0b1d36df06a6576ee53519cfd4620cf0619abb12
 2016-09-29 22:47:52 +00:00
Dan Willemsen f9a8e25486 Trigger binary installation in Soong from Make 
am: 03ce63eaa6

Change-Id: I8276ab905b807a7f264a5978609c94add27bec1a
 2016-09-29 22:44:36 +00:00
Josh Gao 3923e84a49 Allow -lobjc and -framework IOKit in darwin host_ldlibs. 
Bug: http://b/31321337
Test: mma of external/libusb on darwin
Change-Id: I1023a2a7ff1fdf809ac47104bca7b4171861abef
 2016-09-29 14:47:47 -07:00
Dan Willemsen 03ce63eaa6 Trigger binary installation in Soong from Make 
We prepended Soong's binary installation path to PATH, but now
rebuilding binaries that are in Soong and exported to Make produces
inconsistent results. From an empty out directory:

Run `m -j hidl-gen`, PATH will get a hidl-gen binary in out/host/...
Run `m -j android.hardware.tests.foo@1.0`, PATH will get a new hidl-gen
binary in out/soong/host/...
Make a change to hidl-gen, then run `m -j hidl-gen`. The hidl-gen first
in PATH is still the one without the changes.

Bug: 31742855
Test: m -j hidl-gen showcommands
Change-Id: If01a76d10d786dac6f16f31d1142634af4964228
 2016-09-29 13:56:02 -07:00
Dan Willemsen f29c869ac0 Merge changes from topic 'genrule-multi-out' am: 81ef084a00 am: 2a44260f73 
am: 75d27fae46

Change-Id: I017423268cc7463cfd4861213f2dfe457706def7
 2016-09-29 05:55:41 +00:00
Dan Willemsen 10b110570d Remove shared lib name checks am: 27279ece28 am: 40570b9fc4 
am: fde0bb4aba

Change-Id: Ie47708ff9a2e688185a24ad5adf716ae699cee63
 2016-09-29 05:55:40 +00:00
Dan Willemsen 0d5b0a4914 Add export_generated_headers am: b3454ab24d am: db22db3473 
am: 9aa20fa06f

Change-Id: Ifc20f9f90e5d827233a0ef7157b463489b583860
 2016-09-29 05:55:40 +00:00
Dan Willemsen cf8e924898 Support multiple outputs for genrule am: 9c8681f4f9 am: 6966d7071f 
am: 3ca1d9ccbb

Change-Id: I381f9d5ff1f9abe976c8ced89a745d3e3dd54ba9
 2016-09-29 05:55:39 +00:00
Dan Willemsen 7e55fb61c1 Parse genrule's cmd property am: 3f4539b035 am: 392499e757 
am: c7a673f16d

Change-Id: Idd137dd5209dc8762819a942cd6656745d9526fe
 2016-09-29 05:55:38 +00:00
Dan Willemsen 6fbb191573 Expose HostToolPath on the cc module to fix genrule.tool am: 4aa75ca244 am: 2658e9b516 
am: d04c49768b

Change-Id: I02b486fd52719bfd6bf65197dd721b01aa50021f
 2016-09-29 05:55:37 +00:00
Dan Willemsen 75d27fae46 Merge changes from topic 'genrule-multi-out' am: 81ef084a00 
am: 2a44260f73

Change-Id: Iaa4144966f308bd74c5c3b98d39529d39c5030bc
 2016-09-29 05:47:08 +00:00
Dan Willemsen fde0bb4aba Remove shared lib name checks am: 27279ece28 
am: 40570b9fc4

Change-Id: I0669f867e416d76acf6c46b1cd451f63314aacc6
 2016-09-29 05:47:07 +00:00
Dan Willemsen 9aa20fa06f Add export_generated_headers am: b3454ab24d 
am: db22db3473

Change-Id: Ibedd6b8a934e51d4d16ed3579b99f91a5d86a63e
 2016-09-29 05:47:06 +00:00
Dan Willemsen 3ca1d9ccbb Support multiple outputs for genrule am: 9c8681f4f9 
am: 6966d7071f

Change-Id: Iab1dc0b7e789eac9f1e5a7c7e8e45a7d52d337d1
 2016-09-29 05:47:06 +00:00
Dan Willemsen c7a673f16d Parse genrule's cmd property am: 3f4539b035 
am: 392499e757

Change-Id: Iebd6c47dd0998fb74fbd46dd35e843d92d930a68
 2016-09-29 05:47:05 +00:00
Dan Willemsen d04c49768b Expose HostToolPath on the cc module to fix genrule.tool am: 4aa75ca244 
am: 2658e9b516

Change-Id: If6cc08dfcde698af955d2ca2d76f6e0992546d99
 2016-09-29 05:47:04 +00:00
Dan Willemsen 2a44260f73 Merge changes from topic 'genrule-multi-out' 
am: 81ef084a00

Change-Id: Id449809a0258c075de33923517a4b2b32670ec7e
 2016-09-29 05:42:37 +00:00
Dan Willemsen 40570b9fc4 Remove shared lib name checks 
am: 27279ece28

Change-Id: I2c81c7ca8989a1a8d40d87d5da8f6de97c906bc4
 2016-09-29 05:42:37 +00:00
Dan Willemsen db22db3473 Add export_generated_headers 
am: b3454ab24d

Change-Id: I3c893df045a5bfcd5e4bac87a0314f197fe3bd8b
 2016-09-29 05:42:36 +00:00
Dan Willemsen 6966d7071f Support multiple outputs for genrule 
am: 9c8681f4f9

Change-Id: If0306db6c56748faf86164a3df8a72d7ea4d656b
 2016-09-29 05:42:35 +00:00
Dan Willemsen 392499e757 Parse genrule's cmd property 
am: 3f4539b035

Change-Id: I3abea62996d38febc44d9afc0719705de0a54469
 2016-09-29 05:42:35 +00:00
Dan Willemsen 2658e9b516 Expose HostToolPath on the cc module to fix genrule.tool 
am: 4aa75ca244

Change-Id: I1664e5f50df8a22bf91eba1f91af0c8ca41bae79
 2016-09-29 05:42:34 +00:00
Treehugger Robot 81ef084a00 Merge changes from topic 'genrule-multi-out' 
* changes:
  Remove shared lib name checks
  Add export_generated_headers
  Support multiple outputs for genrule
  Parse genrule's cmd property
  Expose HostToolPath on the cc module to fix genrule.tool
 2016-09-29 05:33:04 +00:00
Dan Willemsen 27279ece28 Remove shared lib name checks 
Now that we're no longer using -l, we don't need to strip off the "lib"
prefix and ".so" suffix. Therefore we don't need to make sure the prefix
and suffix exists.

Bug: 31742855
Test: Attempt to link android.hardware.* (hardware/interfaces/*)
Change-Id: I38555014cdc0e430f94359e173bb09e35d45c44e
 2016-09-28 20:58:38 -07:00
Stephen Hines 24717cae87 Switch to using clang-3289846. am: fdab996f64 am: 21beaa0a69 
am: 96a4c2f955

Change-Id: I23937172ceb6f9b7c5405e03884b86cb4f4a2fa5
 2016-09-29 03:12:00 +00:00
Stephen Hines 96a4c2f955 Switch to using clang-3289846. am: fdab996f64 
am: 21beaa0a69

Change-Id: Ic4540c215014ee39a237dc737b6b7626c6eafedc
 2016-09-29 03:07:58 +00:00
Stephen Hines 21beaa0a69 Switch to using clang-3289846. 
am: fdab996f64

Change-Id: I8f5d48cfcf16e375396395c241b74a77bcc9aed7
 2016-09-29 03:03:57 +00:00
Dan Willemsen b3454ab24d Add export_generated_headers 
Similar to export_shared_library_headers, this will export headers
imported from a gensrcs or genrule.

Bug: 31742855
Test: Add export_generated_headers, ensure it's in out/soong/Android-*.mk
Change-Id: Ieadefd007ece8b249f011a258a9c5b27f5d3f594
 2016-09-28 18:31:04 -07:00
Dan Willemsen 9c8681f4f9 Support multiple outputs for genrule 
The underlying code to expose outputs to other modules has suppported
this already for gensrcs (which runs the command multiple times to
create multiple outputs). This allows a genrule to run a command once,
and output multiple files.

Bug: 31742855
Test: Add multi-output genrule; Inspect build.ninja
Change-Id: I72054cc39c0d0e3e44feebba72005e5af1a1709a
 2016-09-28 18:31:04 -07:00
Dan Willemsen 3f4539b035 Parse genrule's cmd property 
Instead of just passing this to ninja, use os.Expand to parse the
variable substitutions. While we're here, define a new "genDir" variable
that is the root of this module's generated directory.

Bug: 31742855
Test: Ensure invalid variables cause error
Test: Inspect commands in build.ninja
Change-Id: Iff6d0499ab57367669e73df52ab7c647358da13b
 2016-09-28 17:38:57 -07:00
Dan Willemsen 4aa75ca244 Expose HostToolPath on the cc module to fix genrule.tool 
Bug: 31742855
Test: Use `tool` in a genrule, ensure it runs properly.
Change-Id: Ib9ff35125edd66cdba8ede4f28aa6b753de0689b
 2016-09-28 17:38:02 -07:00
Stephen Hines fdab996f64 Switch to using clang-3289846. 
Bug: http://b/30252254
Test: Built/boot platform using latest prebuilts.
Change-Id: I47c5e8255f84b6f41d1d3e1f3c986e8699ac573a
 2016-09-28 08:52:48 -07:00
Colin Cross 543d7e6115 Update readme am: 024c32e987 am: 6704ff1b5f 
am: 41cfda6c6e

Change-Id: Id0adf9d1b8cf4b553461b438a39acdb49be6c604
 2016-09-27 00:34:37 +00:00
Colin Cross 41cfda6c6e Update readme am: 024c32e987 
am: 6704ff1b5f

Change-Id: If16227356b008108eddd3a6800f2dff5a93f1db6
 2016-09-27 00:32:37 +00:00
Colin Cross 6704ff1b5f Update readme 
am: 024c32e987

Change-Id: I8f845403fe8b38ed1514e190a289524f8770ffe1
 2016-09-27 00:30:07 +00:00
Colin Cross 024c32e987 Update readme 
Use go/Android.bp link, add a little more on androidmk conversions.

Test: none
Change-Id: Ibe2be4ad54b6d9a8954d7efbb40d04dc54c8dbf2
 2016-09-26 15:44:29 -07:00
Colin Cross 35885452d2 Merge "Revert "Revert "Move system/core/include from -isystem to -I""" am: 0a249ce498 am: 572b83188c 
am: 418e21528f

Change-Id: I453be3d7b7956858deab4c8393954a5a68743017
 2016-09-26 01:16:32 +00:00
Colin Cross 418e21528f Merge "Revert "Revert "Move system/core/include from -isystem to -I""" am: 0a249ce498 
am: 572b83188c

Change-Id: I1e3a0ff45ca0b61662d1d682b44935a1d5785a9f
 2016-09-26 01:14:29 +00:00
Colin Cross 572b83188c Merge "Revert "Revert "Move system/core/include from -isystem to -I""" 
am: 0a249ce498

Change-Id: I2152602aced4232258c027c4b5b513aad53dc8b3
 2016-09-26 01:11:59 +00:00
Colin Cross 0a249ce498 Merge "Revert "Revert "Move system/core/include from -isystem to -I""" 2016-09-26 01:07:09 +00:00
Colin Cross 81b4ca6817 Revert "Revert "Move system/core/include from -isystem to -I"" 
This reverts commit 763a26cef5.

Bug: 31492149
Change-Id: I322f5e31da306951ac13131f5113730e945dedd5
 2016-09-23 19:20:54 +00:00
Colin Cross 8c423c7522 Merge "Revert "Move system/core/include from -isystem to -I"" am: d85c0740e1 am: cd2f6df8ab 
am: 3b28290a36

Change-Id: I0d3908c5390849a0c195e7994aa3c88687448524
 2016-09-23 16:02:50 +00:00