Commit Graph

2276 Commits

Author SHA1 Message Date
Nan Zhang
ce83242a64 Merge "Fixed androidmk crash when parsing external/aac/Android.mk" am: 5951d3e2bb am: 67d5fc5e49
am: 95e16a6b6f

Change-Id: I52094c22dac45354d00610467e0a29d75a20570d
2017-01-28 00:12:49 +00:00
Nan Zhang
95e16a6b6f Merge "Fixed androidmk crash when parsing external/aac/Android.mk" am: 5951d3e2bb
am: 67d5fc5e49

Change-Id: I2fe464be21ad6b5e75d383411a24ba9aa7450e66
2017-01-28 00:10:18 +00:00
Nan Zhang
67d5fc5e49 Merge "Fixed androidmk crash when parsing external/aac/Android.mk"
am: 5951d3e2bb

Change-Id: I3a76b846fc3a88993ee6b8200124326be41ac584
2017-01-28 00:07:48 +00:00
Treehugger Robot
5951d3e2bb Merge "Fixed androidmk crash when parsing external/aac/Android.mk" 2017-01-28 00:05:07 +00:00
Dan Albert
517b7e7c14 Don't force libraries upon static executables. am: dc2597d25a am: 48e5befbdc
am: 50cc75da63

Change-Id: I560b662bc7461fc9038b80725282e27f42388f5c
2017-01-27 23:09:45 +00:00
Dan Albert
50cc75da63 Don't force libraries upon static executables. am: dc2597d25a
am: 48e5befbdc

Change-Id: I2c4c7644ea43b06753f9c62e741e2c88dea07df2
2017-01-27 23:05:14 +00:00
Dan Albert
48e5befbdc Don't force libraries upon static executables.
am: dc2597d25a

Change-Id: If74fae103ddcd5e4add17da6dd20ad22bf06279f
2017-01-27 23:01:14 +00:00
Nan Zhang
62ea583316 Fixed androidmk crash when parsing external/aac/Android.mk
Catched the error when bpparser encountered the non-standard make variables.

Bug: b/34454142
Test: Manual + (m -j blueprint_tools) command
Change-Id: I0766082baa2c2c4020317f975012a476133f4f77
2017-01-27 14:07:38 -08:00
Dan Albert
dc2597d25a Don't force libraries upon static executables.
The linker uses libc++_static but needs to avoid the libc.a
dependency. It does this by setting `stl: "none"` and manually
linking libc++. This behavior matches make.

A better approach would probably be to generalize system_shared_libs
to system_libs and apply those to static executables the same way we
do for dynamic ones, but that's a patch for another day.

Test: make checkbuild
Bug: http://b/34740564
Change-Id: Ie9da0d49a453a220593e8ec2ee721e9af9378007
2017-01-26 17:44:26 -08:00
David Benjamin
7ca8c6a87e Merge "Add libc++ and libc++_static aliases for SDK builds." am: 29c69e83dd am: 4c51fe50e8
am: 8215a5673c

Change-Id: I347a44cfcf4e3ec5a3c9730457685786f9405b77
2017-01-26 21:42:22 +00:00
David Benjamin
8215a5673c Merge "Add libc++ and libc++_static aliases for SDK builds." am: 29c69e83dd
am: 4c51fe50e8

Change-Id: Ia5510a3a3be17eb6969b31b46706e0ea3fab0555
2017-01-26 21:38:21 +00:00
David Benjamin
4c51fe50e8 Merge "Add libc++ and libc++_static aliases for SDK builds."
am: 29c69e83dd

Change-Id: Icd8f61640a7ce5fd25ee06330ca1244af93f1a56
2017-01-26 21:34:21 +00:00
Treehugger Robot
29c69e83dd Merge "Add libc++ and libc++_static aliases for SDK builds." 2017-01-26 21:28:11 +00:00
Brian Carlstrom
707bfba56a Merge "Revert "Switch to clang-3625443."" am: 7f205c8289 am: 0466bfff63
am: a101bdf398

Change-Id: I3742c6943fa2a57d5bdec48a6dcc1fc2d5f179ab
2017-01-26 08:16:13 +00:00
Brian Carlstrom
a101bdf398 Merge "Revert "Switch to clang-3625443."" am: 7f205c8289
am: 0466bfff63

Change-Id: Idb13f892320338a963956430f02fdbe3812b1da2
2017-01-26 08:13:13 +00:00
Brian Carlstrom
0466bfff63 Merge "Revert "Switch to clang-3625443.""
am: 7f205c8289

Change-Id: I1a5fb225bb7daefb5a48141590b57bea191f6b03
2017-01-26 08:10:01 +00:00
Brian Carlstrom
7f205c8289 Merge "Revert "Switch to clang-3625443."" 2017-01-26 08:05:35 +00:00
Stephen Hines
73431cb86e Revert "Switch to clang-3625443."
This reverts commit 1d7513decd.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ida39c91bfc70ba60b2a3113544ec43c566b6c494
2017-01-26 07:59:16 +00:00
Stephen Hines
f1df0f04fe Merge "Switch to clang-3625443." am: 49110a5d88 am: 0e3a363ef6
am: 746d9f8362

Change-Id: I0e51e23d9adaf786723162a1c75cda1a87a0f379
2017-01-26 07:30:09 +00:00
Stephen Hines
746d9f8362 Merge "Switch to clang-3625443." am: 49110a5d88
am: 0e3a363ef6

Change-Id: I27327e7ac3413f0ffa18dcc05d3ee60583aa7249
2017-01-26 07:25:07 +00:00
Stephen Hines
0e3a363ef6 Merge "Switch to clang-3625443."
am: 49110a5d88

Change-Id: Iace499d4fc5a10e82d3812594f3356bb96674017
2017-01-26 07:19:55 +00:00
Treehugger Robot
49110a5d88 Merge "Switch to clang-3625443." 2017-01-26 07:13:21 +00:00
David Benjamin
87f9f03d3f Add libc++ and libc++_static aliases for SDK builds.
c++_shared and c++_static are named libc++ and libc++_static in every
other mode. Allow the same names so targets which are built for both
host and device with SDK may specify a single name for the STL.

Test: external/boringssl is able to use "libc++_static" as the STL.
Change-Id: Ibc579c7e24ddb8de12fbfc6e1b5d80648efa589e
2017-01-25 16:47:31 -05:00
Evgenii Stepanov
8f11547f1b Disable global coverage when a module disables asan. am: 774cb81796 am: d0c027f3ef
am: ecf7a0e1e3

Change-Id: Ic4259668b4a606d706022017d4a5d3b8a11fd626
2017-01-24 21:02:49 +00:00
Evgenii Stepanov
2f7cbcd211 Force Thumb for CFI targets. am: 7ebf9fa3c9 am: b39d94c15c
am: 628df1c0f0

Change-Id: Ice050a714c7a1491ee5a622ed1f0bfa91526f560
2017-01-24 21:02:39 +00:00
Evgenii Stepanov
ecf7a0e1e3 Disable global coverage when a module disables asan. am: 774cb81796
am: d0c027f3ef

Change-Id: I43a0afcbc624e3904698dbb239c829eb828f84fc
2017-01-24 21:00:47 +00:00
Evgenii Stepanov
628df1c0f0 Force Thumb for CFI targets. am: 7ebf9fa3c9
am: b39d94c15c

Change-Id: I03b4b7a9e1ac9fa5f490f4f2922433e84046d09b
2017-01-24 21:00:38 +00:00
Evgenii Stepanov
d0c027f3ef Disable global coverage when a module disables asan.
am: 774cb81796

Change-Id: I98d21cf78da95815d74f43dde669410b199bde44
2017-01-24 20:58:47 +00:00
Evgenii Stepanov
b39d94c15c Force Thumb for CFI targets.
am: 7ebf9fa3c9

Change-Id: Iebbb2ed3d0458f0e760131abf675b0164dc480fb
2017-01-24 20:58:38 +00:00
Evgenii Stepanov
774cb81796 Disable global coverage when a module disables asan.
With SANITIZE_TARGET="address coverage", if a module disables ASan
(address: false), it is left with just coverage, which is not
supported. In that case, disable coverage as well.

Bug: 33091541
Test: see above
Change-Id: Idcd04dad8cab7c7e2644d2408b1b8a381490e5af
2017-01-24 20:55:11 +00:00
Stephen Hines
1d7513decd Switch to clang-3625443.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I9891e817342e45f16afa4acb57d2d136e16161a6
2017-01-23 15:05:27 -08:00
Evgenii Stepanov
7ebf9fa3c9 Force Thumb for CFI targets.
Bug: 22033465
Test: bionic device tests
Change-Id: I672ccc970309631fa895b7134a32c0d403a2151e
2017-01-20 14:13:32 -08:00
Vishwath Mohan
8deb56302a Merge "Hide CFI behind a global flag." am: 97673c06d8 am: df4d484416
am: 236870ac7a

Change-Id: Id9348256090082136e52bc80afd609649a89e227
2017-01-20 01:56:16 +00:00
Vishwath Mohan
236870ac7a Merge "Hide CFI behind a global flag." am: 97673c06d8
am: df4d484416

Change-Id: I397df9a72bc73a8bbda23b28ad12406653b9fbe3
2017-01-20 01:50:45 +00:00
Vishwath Mohan
df4d484416 Merge "Hide CFI behind a global flag."
am: 97673c06d8

Change-Id: I57348d5e2ffc0e26fdf8a368bf81029fa4e0f2b1
2017-01-20 01:45:45 +00:00
Vishwath Mohan
97673c06d8 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Dan Willemsen
2b06cee98d Export cc_test as Make class NATIVE_TESTS am: 0fe7253718 am: 63e228c374
am: 3babf9ddce

Change-Id: Ia4dcc3b5794135bd96b361fd994de1cc072faf5c
2017-01-20 01:20:10 +00:00
Dan Willemsen
3babf9ddce Export cc_test as Make class NATIVE_TESTS am: 0fe7253718
am: 63e228c374

Change-Id: I40092396da20a74feb2697000517ce5b9264a015
2017-01-20 01:14:07 +00:00
Dan Willemsen
63e228c374 Export cc_test as Make class NATIVE_TESTS
am: 0fe7253718

Change-Id: I68cbd83825e285fca8621c7fd2cf615fec8067b8
2017-01-20 01:09:36 +00:00
Vishwath Mohan
1b017a76e1 Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Iccc6e4bf5e7828ab8ce6056f3e40922712faa0d8
2017-01-19 14:40:34 -08:00
Dan Willemsen
0fe7253718 Export cc_test as Make class NATIVE_TESTS
So that make can tell the difference.

Bug: 32177952
Test: Diff build-aosp_arm64.ninja before/after
Change-Id: Icd98ea5f5b4127bf84197c6b651a72708eec57f1
2017-01-17 13:25:49 -08:00
Colin Cross
1d978dd444 Document examples of conditionals in go am: 1a01e83725 am: ed5b3aedfc
am: 010ae45892

Change-Id: Ifa95970e314b1bd96949c9b988297e17cc9b2db4
2017-01-14 04:52:59 +00:00
Colin Cross
aea163e52d Allow genrules to reference generated sources am: 708c424c57 am: c2a3aec13c
am: 4a51c94369

Change-Id: If7c3748f8ce07949e9c1cc6afad012400b55f17d
2017-01-14 04:52:58 +00:00
Colin Cross
010ae45892 Document examples of conditionals in go am: 1a01e83725
am: ed5b3aedfc

Change-Id: I8acbc4688b2b82b6112ebe568c3c4729b93b38b5
2017-01-14 04:50:00 +00:00
Colin Cross
4a51c94369 Allow genrules to reference generated sources am: 708c424c57
am: c2a3aec13c

Change-Id: I262a9344e2fecf98c7bac439a67e0af4730cf771
2017-01-14 04:49:59 +00:00
Colin Cross
ed5b3aedfc Document examples of conditionals in go
am: 1a01e83725

Change-Id: I14b040143e12ea270533cde12ce6abcc04015ccd
2017-01-14 04:47:59 +00:00
Colin Cross
c2a3aec13c Allow genrules to reference generated sources
am: 708c424c57

Change-Id: Ica9fc21b6cab58c07d97211eba4e623027d09b44
2017-01-14 04:47:58 +00:00
Colin Cross
1a01e83725 Document examples of conditionals in go
Test: None
Change-Id: Ie2ad921974dc4ff82a3c6308736830cacfebf806
2017-01-13 18:07:01 -08:00
Colin Cross
708c424c57 Allow genrules to reference generated sources
Call ExtractSourceDeps on genrule srcs properties.

Bug: 34283327
Test: no change to build.ninja
Change-Id: I934a418f32d4c94400728579543ca5c910bf7dfc
2017-01-13 18:06:58 -08:00
Jack He
5843c44e39 Add Android.bp variables to the soong build parser am: 8cc714313c am: 9224bd9587
am: 5548518221

Change-Id: Ib6841ae331bcfc728360fe1ad42a8d64c5636dea
2017-01-12 08:52:15 +00:00