Commit Graph

1786 Commits

Author SHA1 Message Date
Dan Willemsen
b66fa15dbc Support linking against NDK prebuilt libraries am: 97704edd5d am: aefd95fdf2
am: 5fd98e6255

Change-Id: I2be0e92e44e44f744cc2145edf3bfb03bfdcac38
2016-07-08 21:17:21 +00:00
Dan Willemsen
5fd98e6255 Support linking against NDK prebuilt libraries am: 97704edd5d
am: aefd95fdf2

Change-Id: I41b01ab115c0915f0f63a80fbc414f7e7e50c54c
2016-07-08 21:13:13 +00:00
Dan Willemsen
aefd95fdf2 Support linking against NDK prebuilt libraries
am: 97704edd5d

Change-Id: Ib4810b00cad650514bd5662e042aa11bfb526f5d
2016-07-08 21:09:37 +00:00
Dan Willemsen
97704edd5d Support linking against NDK prebuilt libraries
When sdk_version is specified, we need to use the prebuilt ndk versions
of these libraries instead of the platform versions.

Change-Id: I4ff33a234a985041ebe11ab148d64d0f8df66fc4
2016-07-08 20:44:54 +00:00
Colin Cross
af89ec01e6 Remove cc.ModuleContext.module() am: 6886183d8f am: 39040c43ed
am: 595050f88c

Change-Id: Id1c71ffecaecf25e8a3ac1f9438b969dc399a056
2016-07-08 20:29:31 +00:00
Colin Cross
595050f88c Remove cc.ModuleContext.module() am: 6886183d8f
am: 39040c43ed

Change-Id: Ic0d8fcd023c96a0714de733e4b50592a0b6e1180
2016-07-08 20:25:44 +00:00
Colin Cross
39040c43ed Remove cc.ModuleContext.module()
am: 6886183d8f

Change-Id: I2ee1baba749ad788f35ed89ad76017af6ec6a5ce
2016-07-08 20:20:58 +00:00
Colin Cross
6886183d8f Remove cc.ModuleContext.module()
cc.ModuleContext.module() returns a *cc.Module, and is left over from
when the cc package tried to use inheritance.  Remove it and the last
few users.

Change-Id: I9b42ca59689c1b0ada7980fbec923747ed3a53d3
2016-07-08 11:18:46 -07:00
Dan Willemsen
9117a2299a Fix SDK link type check am: 3c316bc03b am: 5ff2a27e89
am: 82ad36c6ec

Change-Id: I85d0f2ac776d17fcd00e3ab574137c00bdfe7e89
2016-07-08 16:57:50 +00:00
Dan Willemsen
82ad36c6ec Fix SDK link type check am: 3c316bc03b
am: 5ff2a27e89

Change-Id: I43240ee1b84691d57ba72853c8cd43935ed7a1f3
2016-07-08 16:54:15 +00:00
Dan Willemsen
5ff2a27e89 Fix SDK link type check
am: 3c316bc03b

Change-Id: Icbcccc3ccb28443a6310ec65e95d0ac2d7d69589
2016-07-08 16:49:59 +00:00
Dan Willemsen
3c316bc03b Fix SDK link type check
This was always returning true, which defeats the point. Fix the check,
then add another exception for NDK libraries.

Change-Id: I139d95ef62d1063c083d6381293072ad3277ae74
2016-07-07 21:38:29 -07:00
Dan Willemsen
e54aca36e2 Merge \\\"Allow static/shared modules to be disabled per-arch\\\" am: 6871062821 am: a1a35b6dfd
am: 4e38a9d8da

Change-Id: I3033386ad2d3802260cfc5d54b8b116d6506ef46
2016-07-08 03:55:32 +00:00
Dan Willemsen
4e38a9d8da Merge \\"Allow static/shared modules to be disabled per-arch\\" am: 6871062821
am: a1a35b6dfd

Change-Id: I609afb40cf8e6e8616b6fbb558769f87eefd81a5
2016-07-08 03:52:05 +00:00
Dan Willemsen
a1a35b6dfd Merge \"Allow static/shared modules to be disabled per-arch\"
am: 6871062821

Change-Id: I99d17489f282d36c49d528ad40f1b00cb9ba35a9
2016-07-08 03:48:35 +00:00
Dan Willemsen
6871062821 Merge "Allow static/shared modules to be disabled per-arch" 2016-07-08 03:38:53 +00:00
Colin Cross
e1dc8ad5fb Merge \\\"Return copies of global sanitizer slices\\\" am: da84958b15 am: 67e77bb931
am: 9ae16b006c

Change-Id: I51186e4a01a661f48fd5ed34df2e113f53a8b790
2016-07-07 21:46:41 +00:00
Colin Cross
9ae16b006c Merge \\"Return copies of global sanitizer slices\\" am: da84958b15
am: 67e77bb931

Change-Id: Ib19ac0b0ccdef7a7c6cadb690291838653095841
2016-07-07 21:43:19 +00:00
Colin Cross
67e77bb931 Merge \"Return copies of global sanitizer slices\"
am: da84958b15

Change-Id: Ic442ac5727c1e1f9eec790635ebffcc360a53bf1
2016-07-07 21:39:36 +00:00
Colin Cross
da84958b15 Merge "Return copies of global sanitizer slices" 2016-07-07 21:32:30 +00:00
Evgenii Stepanov
7c68a5c91b Merge \\\"Target sanitize properties can disable the global sanitizer.\\\" am: db6509c2f8 am: 1c08ee1466
am: 59c9357119

Change-Id: I25822ebb286be5a9f396b5e2f3e5e6d266a022cc
2016-07-07 20:20:19 +00:00
Evgenii Stepanov
59c9357119 Merge \\"Target sanitize properties can disable the global sanitizer.\\" am: db6509c2f8
am: 1c08ee1466

Change-Id: I0757905c11d3abbad66122dd0d8406f22318f85c
2016-07-07 20:17:02 +00:00
Evgenii Stepanov
1c08ee1466 Merge \"Target sanitize properties can disable the global sanitizer.\"
am: db6509c2f8

Change-Id: Ib26d52cafce5bd8dce449317407c807439b01319
2016-07-07 20:13:56 +00:00
Evgenii Stepanov
db6509c2f8 Merge "Target sanitize properties can disable the global sanitizer." 2016-07-07 20:08:11 +00:00
Colin Cross
cc9eb8819f Merge \\\"Don\\\'t specify LOCAL_STRIP_MODULE for static libraries\\\" am: bec7c12043 am: 41f0d7df8b
am: ae39c910a2

Change-Id: I3914efeece7785b1e656505c426b46f8bd562717
2016-07-07 19:29:00 +00:00
Colin Cross
ae39c910a2 Merge \\"Don\\'t specify LOCAL_STRIP_MODULE for static libraries\\" am: bec7c12043
am: 41f0d7df8b

Change-Id: I9b79602aa9551b25fe4b87398386aeb3f28ce6a9
2016-07-07 19:24:42 +00:00
Colin Cross
41f0d7df8b Merge \"Don\'t specify LOCAL_STRIP_MODULE for static libraries\"
am: bec7c12043

Change-Id: I1b9f5c3972cf882cf91d774af5a0559c406d53a9
2016-07-07 19:21:20 +00:00
Treehugger Robot
bec7c12043 Merge "Don't specify LOCAL_STRIP_MODULE for static libraries" 2016-07-07 19:14:54 +00:00
Colin Cross
7b5c22b1f0 Don't specify LOCAL_STRIP_MODULE for static libraries
After I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2 in build/,
LOCAL_STRIP_MODULE := keep_symbols will be honored for prebuilts, which
will trigger an error if it is set on a static library.  Only set
LOCAL_STRIP_MODULE for binaries and shared libraries.

Change-Id: I4e17a78afa7c5810dbf9003166c14a1ff3a59c9e
2016-07-07 11:21:53 -07:00
Evgenii Stepanov
c76207e826 Revert \\\"Target sanitize properties can disable the global sanitizer.\\\" am: 05bafd3784 am: d6fe0581a5
am: a614ed3985

Change-Id: I37270b9f5ae705ad998532029dc3f3f807052c90
2016-07-07 17:58:06 +00:00
Evgenii Stepanov
a614ed3985 Revert \\"Target sanitize properties can disable the global sanitizer.\\" am: 05bafd3784
am: d6fe0581a5

Change-Id: I1afb4babe1ae895b268cf180888f6a41cd765b36
2016-07-07 17:54:58 +00:00
Evgenii Stepanov
fcfe56d194 Target sanitize properties can disable the global sanitizer.
With this change, sanitize: { address: false } disables
SANITIZE_TARGET=address for one target.

Also rename SafeStack to Safestack, because the former can not be
used as a target property.

Bug: 27729263
2016-07-07 10:54:42 -07:00
Evgenii Stepanov
d6fe0581a5 Revert \"Target sanitize properties can disable the global sanitizer.\"
am: 05bafd3784

Change-Id: I165897165c46d550cea097b2dfd0b8efa14bce13
2016-07-07 17:51:51 +00:00
Evgenii Stepanov
05bafd3784 Revert "Target sanitize properties can disable the global sanitizer."
This reverts commit bb02886451.

Breaks SANITIZE_HOST=address

Change-Id: I9791a034e32a83d567b8739a7ec7b61890cb1b97
2016-07-07 17:38:41 +00:00
Evgenii Stepanov
6590daff73 Target sanitize properties can disable the global sanitizer. am: bb02886451 am: 7465e3a3b1
am: 0616c2d702

Change-Id: I5bf855c12429f506c967a6dd50131219c0d7d42f
2016-07-07 17:17:36 +00:00
Evgenii Stepanov
0616c2d702 Target sanitize properties can disable the global sanitizer. am: bb02886451
am: 7465e3a3b1

Change-Id: I7e0b989f93b0a128baf8426b69422020ed6ff4e4
2016-07-07 17:14:39 +00:00
Evgenii Stepanov
7465e3a3b1 Target sanitize properties can disable the global sanitizer.
am: bb02886451

Change-Id: Id6429eeefae06f891f81441d9755031457fc71ee
2016-07-07 17:11:08 +00:00
Dan Willemsen
fed4d19cbb Allow static/shared modules to be disabled per-arch
libz has a case where the static and shared versions of the device
library are supported, but the host shared library must not be defined,
since it would conflict with the system provided version. There's a
separate module 'libz-host' that provides the host shared library
implementation.

So extend the 'static'/'shared' properties to include 'enabled', which
uses arch_variant so that it can be mutated per-arch. It cannot override
a top level 'enabled: false'.

Change-Id: Ia0f1ff31ad77dc4cb148c531b70158e3245031d5
2016-07-06 21:54:12 -07:00
Evgenii Stepanov
bb02886451 Target sanitize properties can disable the global sanitizer.
With this change, sanitize: { address: false } disables
SANITIZE_TARGET=address for one target.

Also rename SafeStack to Safestack, because the former can not be
used as a target property.

Bug: 27729263
Change-Id: I20f55c0e62b2fdd191ba66c0f661a039109bd78f
2016-07-06 16:38:58 -07:00
Colin Cross
cc85e683a4 Return copies of global sanitizer slices
sanitize.begin() modifies the slice returned by Config.SanitizeHost()
and Config.SanitizeDevice(), return a copy so the global slice doesn't
get corrupted.

Bug: 29188876
Change-Id: I4c7a59b7e96529166519b23a1ebda39b8e060c58
2016-07-06 14:30:32 -07:00
Pirama Arumuga Nainar
73e4aa976e Disable integrated-as for Mips am: 58e2dcdeda am: fcd6ca6f91
am: 04b14deba5

Change-Id: I48a1808fdf5fe242c3f66b4e2e094c72beb07158
2016-06-30 20:57:04 +00:00
Pirama Arumuga Nainar
04b14deba5 Disable integrated-as for Mips am: 58e2dcdeda
am: fcd6ca6f91

Change-Id: I6d6bbdcb871f9b29ce4c690f8bb21d1cc021e921
2016-06-30 20:53:17 +00:00
Pirama Arumuga Nainar
fcd6ca6f91 Disable integrated-as for Mips
am: 58e2dcdeda

Change-Id: Ie38430f215e100699ceabb02e6fb273ddbd22bf8
2016-06-30 20:49:37 +00:00
Pirama Arumuga Nainar
58e2dcdeda Disable integrated-as for Mips
Bug: http://b/29771478

Hand-coded assembly in various projects will fail to compile after Clang
switches to integrated assembler for Mips.  Disable integrated-as for
Mips.

Test: Verified Mips builds on AOSP both with the old Clang prebuilts and
the new prebuilts (https://android-review.googlesource.com/#/c/243871/)

Change-Id: Idf441cb9c6c2afc8997d5ee56420885930087918
2016-06-30 04:50:50 +00:00
Dan Willemsen
5e5ea1df7c Remove build/libs am: 5d2038fe06 am: 8734eaa89e
am: 4382e7f519

Change-Id: I418fa103bf7e3e5327ce4e5b5dd7d95896004527
2016-06-17 23:38:41 +00:00
Dan Willemsen
4382e7f519 Remove build/libs am: 5d2038fe06
am: 8734eaa89e

Change-Id: I68e89663f6f5843e31fc5db6edc8d125cff16ce4
2016-06-17 23:33:09 +00:00
Dan Willemsen
8734eaa89e Remove build/libs
am: 5d2038fe06

Change-Id: I72e3f0704a9124ec3dd7f8dba539a632c6ebc686
2016-06-17 23:29:32 +00:00
Dan Willemsen
5d2038fe06 Remove build/libs
Bug: 28001743
Change-Id: Id5bcc11a08b3677ee1caf5b564ef0f2fb65026da
2016-06-16 15:22:09 -07:00
Dan Willemsen
8673f389ca Merge \\\"Remove support for libstdc++ on Android/Linux/Darwin\\\" am: d8315c8d1a am: 969dd4266f
am: 74d555e132

Change-Id: I6d0bc932053ac6a52b9bb0df4371b361b4c0d272
2016-06-15 23:06:56 +00:00
Colin Cross
5d3fad718a Merge changes from topic \\\'parser\\\' am: c30f10e390 am: 749d12c3b9
am: 775da55bf8

Change-Id: I80cbc9db0dd738bf56b28408198112d97f7bbaf3
2016-06-15 23:06:56 +00:00