Commit Graph

860 Commits

Author SHA1 Message Date
Colin Cross
fe2adfd3b5 Fix install path of benchmarks am: 624b8ed0b3 am: 83d93f3da8
am: 3375e95f8c

Change-Id: Ic988d7a6c4067c2861f0c7f15ed1c7d444e42d25
2016-07-12 06:11:50 +00:00
Colin Cross
3375e95f8c Fix install path of benchmarks am: 624b8ed0b3
am: 83d93f3da8

Change-Id: I7e24de2c40fddb54be72bf293cfa71af72aa7fe3
2016-07-12 06:09:05 +00:00
Colin Cross
83d93f3da8 Fix install path of benchmarks
am: 624b8ed0b3

Change-Id: I50844c0c90d3a7da14adea60561b7d248ac43fc0
2016-07-12 06:06:14 +00:00
Colin Cross
956fd6de78 Add system shared library dependencies to Android.mk am: b5bc4b412a am: 474699be6e
am: 6310cfb449

Change-Id: I4caeb711cf480a9451212e35d9364ff41f94a9da
2016-07-12 00:46:45 +00:00
Colin Cross
6310cfb449 Add system shared library dependencies to Android.mk am: b5bc4b412a
am: 474699be6e

Change-Id: I1456a129803581a5d956713ed7f33c87b774761f
2016-07-12 00:44:14 +00:00
Colin Cross
474699be6e Add system shared library dependencies to Android.mk
am: b5bc4b412a

Change-Id: I8006b0b3b61f30192fff3ef269049d2216df7452
2016-07-12 00:41:46 +00:00
Colin Cross
624b8ed0b3 Fix install path of benchmarks
Benchmarks should go in /data/nativetest/<module> like tests.

Change-Id: Ib72ee699334da6a6d27813822e1f86f2863227b3
2016-07-11 17:20:09 -07:00
Colin Cross
d3a7c9b63d Update cc_benchmark to use libgoogle-benchmark am: 2683274349 am: c1d0f687e7
am: a2876389a9

Change-Id: I6ecbaf40380fef224d5aff71dde2561308adcced
2016-07-12 00:17:54 +00:00
Colin Cross
a2876389a9 Update cc_benchmark to use libgoogle-benchmark am: 2683274349
am: c1d0f687e7

Change-Id: I8ca60eae4b6c3bfa7f4dd402f5a559498e7ecbad
2016-07-12 00:15:21 +00:00
Colin Cross
c1d0f687e7 Update cc_benchmark to use libgoogle-benchmark
am: 2683274349

Change-Id: I6d9f7907f3976d53b0fc7d0feccc905ce2390939
2016-07-12 00:12:42 +00:00
Colin Cross
b5bc4b412a Add system shared library dependencies to Android.mk
We were missing dependencies from the prebuilts to the system shared
libraries, which could cause libc to not be installed if only soong
modules were built.

Change-Id: Ie5c237d7be23c6170e8b586b013f6456a8462230
2016-07-11 16:14:13 -07:00
Dan Willemsen
2528ec1596 Support no configured device architectures am: 3f32f03067 am: f104025805
am: 1c462c395d

Change-Id: I96ac7c55bf149a9ac468d8529a3a264600c2c4d9
2016-07-11 22:48:39 +00:00
Dan Willemsen
1c462c395d Support no configured device architectures am: 3f32f03067
am: f104025805

Change-Id: I3b8c0a56971f76c05fdfb03569476ff111bd11ec
2016-07-11 22:46:10 +00:00
Dan Willemsen
f104025805 Support no configured device architectures
am: 3f32f03067

Change-Id: I2bce3feca58df2e9682bef04ee39232f58185d52
2016-07-11 22:43:46 +00:00
Colin Cross
2683274349 Update cc_benchmark to use libgoogle-benchmark
Updates soong to match I1565cf680298a1765e88162d8b0e59dedba29bd7

Change-Id: I787675562e3f1dceb9a56f2bcb533a551cae550a
2016-07-11 22:39:35 +00:00
Dan Willemsen
3f32f03067 Support no configured device architectures
There are some builds where we only want to build host tools, and we may
not have a valid device configuration. Support 0 device architectures
and modules that don't have any configured way to build.

Change-Id: I732251e1cd3cdbfafbc6ef6a550e33e653876f7c
2016-07-11 14:36:48 -07:00
Dan Willemsen
d71cac8d5f Apply export_include_dirs to assembly files am: 76f0827ce3 am: 6f4ce93924
am: fc2c2220f6

Change-Id: I4c2420c99fabc5a806e567abd0dfd1477bd16a51
2016-07-11 20:24:27 +00:00
Dan Willemsen
948b01f823 Stop exporting NDK prebuilt modules to Make am: 72d3993c9b am: 89ae37fb8d
am: 55922725ce

Change-Id: I74dc323639b2da32eadb2ee1a4fcb5314cef1fd3
2016-07-11 20:24:26 +00:00
Dan Willemsen
fc2c2220f6 Apply export_include_dirs to assembly files am: 76f0827ce3
am: 6f4ce93924

Change-Id: If2d1132b9f1cfb9e244a1775b027418d0d456f4e
2016-07-11 20:21:50 +00:00
Dan Willemsen
55922725ce Stop exporting NDK prebuilt modules to Make am: 72d3993c9b
am: 89ae37fb8d

Change-Id: Ifbeedaa82613cc966c50a525e6cb85300065defa
2016-07-11 20:21:49 +00:00
Dan Willemsen
6f4ce93924 Apply export_include_dirs to assembly files
am: 76f0827ce3

Change-Id: Ibe3c32493f6142e241bc5e78c3c31711cec07163
2016-07-11 20:18:05 +00:00
Dan Willemsen
89ae37fb8d Stop exporting NDK prebuilt modules to Make
am: 72d3993c9b

Change-Id: I458ef00fe702a385089d0b9ca784c49899a9931b
2016-07-11 20:18:04 +00:00
Dan Willemsen
76f0827ce3 Apply export_include_dirs to assembly files
Instead of putting these in CFlags, use GlobalFlags instead. This
matches the Make behavior.

The exportFlagProducer could be generic, but for now only has include
directories, so it should be safe for all file types.

Change-Id: I2862f08e7ad473ebacaa88ad2c4510248cad316f
2016-07-09 07:20:59 +00:00
Dan Willemsen
72d3993c9b Stop exporting NDK prebuilt modules to Make
Make isn't going to use any of these anytime soon. So hide them from
make for now, and be sure to save the AndroidMk shared library
dependencies before we convert them to NDK dependencies.

And $(ACP) is no longer used by $(copy-file-to-target)

Change-Id: I8f8f7d0177d31ba4206c0bc1f2ff952dce53b6b4
2016-07-08 23:41:36 -07:00
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