Commit graph

11687 commits

Author SHA1 Message Date
Dan Willemsen
98b277b930 Merge "Fix link_type checking" am: 665cda08f0 am: 1347d959de am: 8459bbca6f
am: 83aba3a7ab

Change-Id: I0cca5c1e262c8a8d92858ed5c927e4775c2e3a6e
2016-09-20 03:29:59 +00:00
Dan Willemsen
83aba3a7ab Merge "Fix link_type checking" am: 665cda08f0 am: 1347d959de
am: 8459bbca6f

Change-Id: I22da0f1703995c4734a72901abe2dbcee62c1406
2016-09-20 01:01:38 +00:00
Dan Willemsen
8459bbca6f Merge "Fix link_type checking" am: 665cda08f0
am: 1347d959de

Change-Id: Ia7ba9accbfa4c7de8843d5554a62524500509d5b
2016-09-19 23:21:16 +00:00
Dan Willemsen
665cda08f0 Merge "Fix link_type checking" 2016-09-19 21:54:09 +00:00
Paul Duffin
32bd0adf9c Add targets for building individual modules using javac
This is needed in order to be able to run error prone (which is
a plugin replacement for javac) on a subset of the java code.

Bug: 31507496
Test: Build javac-check-core-tests and check the resulting JAR
Change-Id: I5a556920572fcdad7b39d67e3f00fe0e0f1f8f46
2016-09-19 13:38:51 +01:00
Dan Willemsen
3f3df96be9 Merge "Only update previous product config when changed" am: 2fcacb5a22 am: 5f381cfcb2 am: 8e77f86d58
am: c99f688971

Change-Id: I106fcb5c030a2f9a5241a0763060179eeb0a4077
2016-09-17 02:44:20 +00:00
Dan Willemsen
c99f688971 Merge "Only update previous product config when changed" am: 2fcacb5a22 am: 5f381cfcb2
am: 8e77f86d58

Change-Id: Id86be7706a190b3264ba1aba4ce462cb785f15fa
2016-09-17 02:41:50 +00:00
Dan Willemsen
8e77f86d58 Merge "Only update previous product config when changed" am: 2fcacb5a22
am: 5f381cfcb2

Change-Id: I77598bb8449c8b4b83e93453dd46a658af66bab1
2016-09-17 02:38:49 +00:00
Dan Willemsen
58bb12ac1b Merge "Remove objclean" am: 1d4b79dde2 am: beaa6df59f am: b4773ae479
am: 274d041107

Change-Id: If72f67511695a2d400b95c654bc101f9579affaf
2016-09-16 22:46:08 +00:00
Dan Willemsen
274d041107 Merge "Remove objclean" am: 1d4b79dde2 am: beaa6df59f
am: b4773ae479

Change-Id: Ic4333c9a139afc6625408142549cec834b1f1c9a
2016-09-16 22:11:31 +00:00
Dan Willemsen
b4773ae479 Merge "Remove objclean" am: 1d4b79dde2
am: beaa6df59f

Change-Id: I73a68779f7b2e321c66e6102dca290828a9cd25f
2016-09-16 22:02:31 +00:00
Dan Willemsen
2cfbdf460d Only update previous product config when changed
I'm working on removing the --ignore_dirty=$(OUT_DIR)/% argument from
Kati. If we're always writing to a file that we're also reading, then
with that flag removed, we'll always reparse all the makefiles.

So instead, use the method from the generated java file cleanup where we
read from a "previous" file, write to a "current" file, then use a
cmp || mv to overwrite the "previous" file if necessary. When the flag
is removed, this will cause Kati to need to run twice any time this
changes, but it's better than forever.

Bug: 30947985
Test: Switch between aosp_arm-eng and full-eng
Change-Id: Id2d1445809b60ce26700bb2aca765df3b5c2b360
2016-09-16 13:17:08 -07:00
Dan Willemsen
da7d25f2d1 Remove objclean
We don't need to manually remove objects when switching SANITIZE_TARGET
-- that will be handled by Ninja noticing that the command lines are
different.

Bug: 30947985
Test: None
Change-Id: I83c15981cf6ea258bb7fa85490b0b1ede1058aa6
2016-09-16 12:53:20 -07:00
Dan Albert
222f6b4361 Use libcompiler-rt_extras with NDK builds. am: c28e4bcb1c am: d042352816 am: d7c48e9f9d
am: d11f78fbd5

Change-Id: I63661c6eb5ab5172732bbb60367483cec3eecf8b
2016-09-16 06:56:35 +00:00
Dan Albert
9ef0a8bb26 Always link libdl with libc++ for the NDK. am: 2936a1e84b am: ec6223ec3c am: 7fde1f9c6e
am: 3f0f58a60b

Change-Id: Ic924ff213b2a9c3e847ea721f836b05bbac3bc3e
2016-09-16 06:56:26 +00:00
Dan Albert
d11f78fbd5 Use libcompiler-rt_extras with NDK builds. am: c28e4bcb1c am: d042352816
am: d7c48e9f9d

Change-Id: I95f49f3b0056efd2de574fde3a3760b8d43f0963
2016-09-16 06:54:03 +00:00
Dan Albert
3f0f58a60b Always link libdl with libc++ for the NDK. am: 2936a1e84b am: ec6223ec3c
am: 7fde1f9c6e

Change-Id: Ia0f0f06883dd420034a230dfaa6bd32092d87c51
2016-09-16 06:53:55 +00:00
Dan Albert
d7c48e9f9d Use libcompiler-rt_extras with NDK builds. am: c28e4bcb1c
am: d042352816

Change-Id: Icb272f25c0c94ebfed549382eefd36363b0b7a1f
2016-09-16 06:51:03 +00:00
Dan Albert
7fde1f9c6e Always link libdl with libc++ for the NDK. am: 2936a1e84b
am: ec6223ec3c

Change-Id: I18fb4af4cd80609ba7bec3d23509df3d3cb6ecf0
2016-09-16 06:50:54 +00:00
Dan Albert
d042352816 Use libcompiler-rt_extras with NDK builds.
am: c28e4bcb1c

Change-Id: I21541bee4a55951601b6cd110ec78ae94a5da94c
2016-09-16 06:45:32 +00:00
Dan Albert
ec6223ec3c Always link libdl with libc++ for the NDK.
am: 2936a1e84b

Change-Id: I41b0ce041345477931b0b0f59212fcda31899259
2016-09-16 06:45:23 +00:00
Treehugger Robot
7b351cadfc Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
* changes:
  Use libcompiler-rt_extras with NDK builds.
  Always link libdl with libc++ for the NDK.
2016-09-16 06:40:32 +00:00
Ryan Campbell
cdabc21349 Merge "Fix typo in coverage target out path." am: c6507670f2 am: 1fd609359d am: ee20a35082
am: 4fac69d7ca

Change-Id: I87affeaa765235f1108cdadc124587b42ee162c0
2016-09-16 02:21:32 +00:00
Ryan Campbell
4fac69d7ca Merge "Fix typo in coverage target out path." am: c6507670f2 am: 1fd609359d
am: ee20a35082

Change-Id: I0606159c8917927e4c8b4ad6ff67e73ba9473085
2016-09-16 02:19:03 +00:00
Ryan Campbell
ee20a35082 Merge "Fix typo in coverage target out path." am: c6507670f2
am: 1fd609359d

Change-Id: I3650bd75e4b3a8e03f613e430c65f62ef63aaf37
2016-09-16 02:16:02 +00:00
Ryan Campbell
737bc02ee8 Fix typo in coverage target out path.
Change-Id: I4a448708ab74e08b2c515039ee5d71c32861214e
2016-09-15 17:32:13 -07:00
Dan Willemsen
121e284b46 Fix link_type checking
This was printing "error:", but not actually triggering an error.
Instead of trying to write a single line bash script to handle this,
move the actual check into python. This allows us to print all of the
errors for a single module before triggering the failure.

Also updates the warning format and the warn.py script to properly parse
these warning. Many of the java:sdk -> java:platform warnings are false
positives due to the lack of LOCAL_SDK_VERSION markings on prebuilts.

Individual tags can be marked as warnings now, which lets us check for
system libraries linking against vendor libraries (which won't work on
AOSP). I'm not sure this is a completely valid check, which one reason
that it's just a warning.

Test: m all_link_types (with some missing libs commented out)
Change-Id: I333e418c9a4511b7c7e826891ae481da08fbf6f9
2016-09-15 14:40:39 -07:00
Colin Cross
a2a211aa23 Merge "Remove SRC_SYSTEM_HEADERS" am: 4a6862e59b am: 195857c6dd am: e0e5754f23
am: 2d5011fd0e

Change-Id: I66b7c6bc537990fd26d3466e046727aabc297323
2016-09-15 18:47:04 +00:00
Colin Cross
2d5011fd0e Merge "Remove SRC_SYSTEM_HEADERS" am: 4a6862e59b am: 195857c6dd
am: e0e5754f23

Change-Id: Ie517fe1520abc84807159ee80e50333fa9b32f84
2016-09-15 18:44:28 +00:00
Colin Cross
e0e5754f23 Merge "Remove SRC_SYSTEM_HEADERS" am: 4a6862e59b
am: 195857c6dd

Change-Id: I28abe9c363ddd963fb5010586fc2cddaee89c015
2016-09-15 18:41:57 +00:00
Treehugger Robot
4a6862e59b Merge "Remove SRC_SYSTEM_HEADERS" 2016-09-15 18:27:45 +00:00
Colin Cross
4ed13c38a5 Remove SRC_SYSTEM_HEADERS
It is inherited from Soong now.

Bug: 31492149
Change-Id: Ia9bfd9662dba16032dac68b55b4f0743c0688139
2016-09-15 09:29:15 -07:00
Yoshisato Yanagisawa
b18251a776 Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748 am: 4d5f3043a2 am: 57e615605c
am: a25256f715

Change-Id: Ia51e82d0ebd8cb87a39485c70697aec0ddf5d59c
2016-09-15 04:06:17 +00:00
Yoshisato Yanagisawa
a25256f715 Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748 am: 4d5f3043a2
am: 57e615605c

Change-Id: I632eccd90114806053b9441a9dc952e09b635f59
2016-09-15 03:55:44 +00:00
Yoshisato Yanagisawa
57e615605c Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748
am: 4d5f3043a2

Change-Id: I1cb95bee90e922a74d121f0ed78dc08953cfa735
2016-09-15 03:53:43 +00:00
Treehugger Robot
766c348748 Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." 2016-09-15 03:41:24 +00:00
Dan Albert
c28e4bcb1c Use libcompiler-rt_extras with NDK builds.
We want to build things in CTS (things built against the NDK) with
integer overflow checks. Some projects in the tree also make explicit
calls to the overflow checked builtins, and those projects need to be
built with the NDK (external/dng_sdk is the specific example that
brought this up).

Test: make checkbuild tests
Bug: None
Change-Id: Iab27dd0d931f723140de242049fa72f3b1ce0fb8
2016-09-14 16:08:48 -07:00
Dan Albert
2936a1e84b Always link libdl with libc++ for the NDK.
libc++ requires libdl whether it's statically linked or not.

Test: make checkbuild tests
Bug: None
Change-Id: I8abdcfaef779b358196716ab1193cebe278317ac
2016-09-14 16:08:04 -07:00
Dan Willemsen
8dbb3dd0f6 Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6 am: f9fc0ea6fe am: 7c4ced5337
am: 196f190592

Change-Id: Ia1214a234a5f59cdf41cd74cb3fc8684b04e0200
2016-09-14 03:06:47 +00:00
Ryan Campbell
af2091b217 Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07 am: 6b92bb4ebb am: 577eab3323
am: 5a63fe6856

Change-Id: I264e7ee9d8139c79fb882f40f1cb6854d2e24a8b
2016-09-14 03:05:55 +00:00
Dan Willemsen
a7919bd18c Merge "Fix building static linux binaries" am: 8bb71cef9f am: 5cf6a4578d am: a4f8d8b2a3
am: 93a0afc749

Change-Id: I374e33412c727a0df4522156db7cd47268e4c1e3
2016-09-14 03:05:52 +00:00
Dan Willemsen
4cb7686365 resolve merge conflicts of 8dadc2d to nyc-mr1-dev-plus-aosp
am: d111debc18

Change-Id: If1706cc449750030bedb56ecf1f2e60a91105ea3
2016-09-14 03:05:49 +00:00
Alan Viverette
adb1ed34f8 Add transition support library to docs path to fix build am: 9c535433df am: ec58ebb4ee
am: c33fe0838d

Change-Id: I4e27adc8e0ed30e1c0705a57bc7f7919fb11022d
2016-09-14 02:56:44 +00:00
Dan Willemsen
196f190592 Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6 am: f9fc0ea6fe
am: 7c4ced5337

Change-Id: Ibc3c3fca687f7541d779d390e3cbc6123f88e149
2016-09-13 22:51:35 +00:00
Dan Willemsen
7c4ced5337 Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6
am: f9fc0ea6fe

Change-Id: I0b06d2a331cf6788e842d91d8b246df2345f10d8
2016-09-13 22:48:36 +00:00
Dan Willemsen
5bdd08b2d9 Fix shared library install dependencies outside of /system
For properly picking the shared library install dependencies, HOST_OUT
and HOST_CROSS_OUT are necessary so that we don't add a dependency
between Linux and Windows. But for target modules, we must use
TARGET_OUT_ROOT instead of TARGET_OUT, or modules in /data and /vendor
won't have proper install dependencies.

Bug: 31462199
Test: m bionic-unit-tests; manual diff of generated ninja file
Change-Id: I828fa2664613296cc6c431813f5657abffdd2b8f
2016-09-13 13:47:06 -07:00
Ryan Campbell
5a63fe6856 Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07 am: 6b92bb4ebb
am: 577eab3323

Change-Id: I36a4fc67e87e8561486111263b0d6b6ed1bdefcc
2016-09-13 20:01:23 +00:00
Ryan Campbell
577eab3323 Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07
am: 6b92bb4ebb

Change-Id: I8d359d0dc1fd72491239152f3c6b852c307ca919
2016-09-13 19:58:51 +00:00
Ryan Campbell
1e1ecd5d07 Merge "Implement path-based enabling of code coverage." 2016-09-13 19:48:34 +00:00
Dan Willemsen
93a0afc749 Merge "Fix building static linux binaries" am: 8bb71cef9f am: 5cf6a4578d
am: a4f8d8b2a3

Change-Id: I3a635cfbc7d8d322741270881de6bb757fe2a9fb
2016-09-13 19:34:23 +00:00
Dan Willemsen
a4f8d8b2a3 Merge "Fix building static linux binaries" am: 8bb71cef9f
am: 5cf6a4578d

Change-Id: Ic8f3a7eb287e42f029c36653c2c7a3c0de65b155
2016-09-13 19:31:22 +00:00
Dan Willemsen
c9aa6fca41 Fix building static linux binaries
BUILD_HOST_static has been broken because I was stripping
-Wl,--start-group/-Wl,--end-group into a separate set of ldflags instead
of keeping them wrapped around some of the ldlibs. So don't pass some of
the build system flags through the ldlibs checker.

Bug: 30898128
Change-Id: I332b42679695cdc5da3cb0036290b6a3544699c0
2016-09-13 17:48:07 +00:00
Ryan Campbell
81c9d29dad Implement path-based enabling of code coverage.
Native coverage is enabled by setting NATIVE_COVERAGE to true
and specifying a list of paths in the COVERAGE_PATHS
environment variable. Files are exported to a zip file in the
target out directory.

Change-Id: I66a2ddd88e849bec1cc0cdae1b51fe18a007e2c3
2016-09-13 10:27:25 -07:00
Julien Desprez
2261b809b6 Merge "Export the cts tests jar required to run unit tests" 2016-09-13 07:48:15 +00:00
Dan Willemsen
d111debc18 resolve merge conflicts of 8dadc2d to nyc-mr1-dev-plus-aosp
Change-Id: I296a81c17f9311a9425619141e1b5f5f5fb4c0dc
2016-09-12 21:43:19 -07:00
Dan Willemsen
8dadc2d2e6 Merge "Remove incremental workaround for aapt overlays" am: 946e58bdff
am: cd573e3aef

Change-Id: I7f90596676af64202fe17f76beb49f0a61a0dc1b
2016-09-13 04:38:22 +00:00
Yoshisato Yanagisawa
a2ca270502 goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set.
During the development of goma client, we sometimes need to use goma
compiler_proxy, which has already been running.

Test: NOSTART_GOMA=1 USE_GOMA=1 m.

Change-Id: Ifa969c40871325fd43ee6443ddbe3b18fde62c5a
2016-09-13 13:13:52 +09:00
Dan Willemsen
8e6e6fdba9 Remove incremental workaround for aapt overlays
This workaround to clean package intermediates is no longer necessary,
as ninja reruns commands whose command line changes.

Test: switch between product overlays that use add-resource, verify
      R.java is regenerated.
Change-Id: Icb1f76360e39882e4401180414a031956777b020
2016-09-12 20:30:12 -07:00
Alan Viverette
c33fe0838d Add transition support library to docs path to fix build am: 9c535433df
am: ec58ebb4ee

Change-Id: I88faba8d91efcd113244c3984ddb7a4ce59968ab
2016-09-13 02:27:19 +00:00
Alan Viverette
ec58ebb4ee Add transition support library to docs path to fix build
am: 9c535433df

Change-Id: I432a666e4a1c8d62ec5bb7414f2b2c90efd79892
2016-09-13 02:22:17 +00:00
Dan Willemsen
15346d5e2d Merge "Remove speex from the pathmap" am: fbfff3129e am: 7da7001c18 am: 50e79ad9ce
am: 73da86ee11

Change-Id: Id2e6e6d5e9aee416d43794c0f0634b1f51fbe14d
2016-09-13 00:51:24 +00:00
Dan Willemsen
73da86ee11 Merge "Remove speex from the pathmap" am: fbfff3129e am: 7da7001c18
am: 50e79ad9ce

Change-Id: I79f1ad4aedd657fbaf66e2f9e64dd4c7e9231006
2016-09-13 00:21:35 +00:00
Dan Willemsen
50e79ad9ce Merge "Remove speex from the pathmap" am: fbfff3129e
am: 7da7001c18

Change-Id: I2af31462ac7a45c2ac0d3d5f5335c6081fbae7d2
2016-09-13 00:19:05 +00:00
Treehugger Robot
fbfff3129e Merge "Remove speex from the pathmap" 2016-09-13 00:07:28 +00:00
Dan Willemsen
208d3c2461 Remove speex from the pathmap
libspeexresampler uses LOCAL_EXPORT_C_INCLUDE_DIRS to export this path
to all of its users already.

Test: m libaudiopreprocessing libaudioutils
Change-Id: I682303142840d6f0f02c990de8e713620840bbda
2016-09-12 16:16:50 -07:00
Dan Albert
53e9e510a4 Merge "Update NDK gtest lib names." am: 56c2a18a50 am: 146540b535 am: 5eb8f65378
am: 45fe3712fc

Change-Id: Ia4be846ad7e59dae07dec3eee9df2f2f986c5010
2016-09-12 21:32:33 +00:00
Dan Albert
45fe3712fc Merge "Update NDK gtest lib names." am: 56c2a18a50 am: 146540b535
am: 5eb8f65378

Change-Id: If949af2958f4cf844b844f69e1311bcb9ab6b4fe
2016-09-12 21:24:56 +00:00
Dan Albert
5eb8f65378 Merge "Update NDK gtest lib names." am: 56c2a18a50
am: 146540b535

Change-Id: I32717473ff1d38f8abca819eb0b21ccfc9153d59
2016-09-12 21:09:54 +00:00
Treehugger Robot
56c2a18a50 Merge "Update NDK gtest lib names." 2016-09-12 20:48:42 +00:00
Dan Willemsen
8eb4d8589d Merge "Fix libgcov.a dependency" am: f9d5fb97cb am: 4b9f214a7b am: 64deaba889
am: 2277a46756

Change-Id: I57dc91cf9b928b4f1b6661474b653e453e2f9041
2016-09-12 19:42:17 +00:00
Dan Willemsen
2277a46756 Merge "Fix libgcov.a dependency" am: f9d5fb97cb am: 4b9f214a7b
am: 64deaba889

Change-Id: I3648ae9652438dddde23afb7bd6392751bbae442
2016-09-12 19:23:13 +00:00
Dan Willemsen
64deaba889 Merge "Fix libgcov.a dependency" am: f9d5fb97cb
am: 4b9f214a7b

Change-Id: Ia4aadb15b81c53014b135ff09d24b3641789b96b
2016-09-12 19:19:42 +00:00
Dan Willemsen
7db70a3b0a Fix libgcov.a dependency
Now that Soong is generating libgcov.a, we need a dependency here.

Change-Id: Ie8d97339fd584eed178cc57b9333d38754ab1135
2016-09-12 18:09:20 +00:00
David Brazdil
c92f18fb90 resolve merge conflicts of 0976590 to nyc-mr1-dev-plus-aosp
am: 29441f934d

Change-Id: I52cb95860580feea89b82f7ccb6d865b67964228
2016-09-12 18:03:11 +00:00
David Brazdil
29441f934d resolve merge conflicts of 0976590 to nyc-mr1-dev-plus-aosp
Change-Id: I67a45fd1d034f143e9605cc2576c16aea4f8dbc9
2016-09-12 16:58:12 +01:00
David Brazdil
0976590e04 Merge "Update build rules for VDEX" am: 3a04e1b82f
am: 50513362fa

Change-Id: I41040711c09e7cd514c7df33ba3f33350990acd1
2016-09-12 15:09:08 +00:00
David Brazdil
3a04e1b82f Merge "Update build rules for VDEX" 2016-09-12 14:57:19 +00:00
Julien Desprez
7b10950b8a Export the cts tests jar required to run unit tests
Bug: 31393228
Change-Id: Id5ce5beccd70c67be6d4bfed01f7206a48498fc2
2016-09-12 11:19:48 +01:00
Colin Cross
d2e241892c Merge "Remove global linker search paths" am: 39c1c9ae12 am: 01d1c0b442 am: 6b7762a458
am: b50e65d097

Change-Id: Id0abe4d5b0ee090ab53d999521bfc0f47e76afc6
2016-09-09 20:47:00 +00:00
Colin Cross
b50e65d097 Merge "Remove global linker search paths" am: 39c1c9ae12 am: 01d1c0b442
am: 6b7762a458

Change-Id: I216f2ec8c20182745edd25c442360b9303b52ad2
2016-09-09 20:40:29 +00:00
Alan Viverette
9c535433df Add transition support library to docs path to fix build
Change-Id: I277df6af728aea4aaa5b10605cf2a6a44c2a246f
2016-09-09 16:39:18 -04:00
Colin Cross
6b7762a458 Merge "Remove global linker search paths" am: 39c1c9ae12
am: 01d1c0b442

Change-Id: Ifd0478970be0ab37374f5445b5a9501a0c041123
2016-09-09 20:37:29 +00:00
Colin Cross
39c1c9ae12 Merge "Remove global linker search paths" 2016-09-09 20:27:21 +00:00
Colin Cross
067d781530 Remove global linker search paths
Remove the global linker search path, as it can cause spurious build
failures.  If a library with the same name as a system library is in the
process of being written to the directory in the global search path, and
the linker may try to read the partially-written built one instead of the
system one.  We already use full paths to libraries for target builds,
do the same for host builds.  Also remove the normalize library
functions, they are no longer necessary.

Test: m -j checkbuild
Bug: 31393456
Change-Id: If9fc631e111f568c700fd73e103445c30d7e9d11
2016-09-09 11:01:15 -07:00
David Brazdil
70470166c7 Update build rules for VDEX
ART now produces a new output file called VDEX, produced alongside the
existing OAT file. This patch updates the relevant build rules.

Bug: 30937355
Change-Id: Ib6be9f8f36c8f061dbbebd72cb55a5d4b6dc27eb
2016-09-09 09:41:10 +01:00
Dan Albert
f5d024d31a Update NDK gtest lib names.
The NDK gtest libs are always suffixed to simplify the make macro
that generates the test modules.

Bug: http://b/16574165
Change-Id: I1c9647e90aff2f1e9da4a88cad30199b1e423757
2016-09-08 23:10:20 -07:00
Keun Soo Yim
3c0ffa319c support vts compile mode flag
Change-Id: I05c347851cfc41c617b055209d81318a1a60918e
2016-09-08 20:36:34 -07:00
Dan Willemsen
d37bfaa4cf Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd am: 01784e0aef am: 27766efeaa
am: 4dc61a8ce3

Change-Id: I3ed3c8b7395f64ca67614f58a5408fc84e3a3547
2016-09-09 01:43:22 +00:00
Dan Willemsen
4dc61a8ce3 Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd am: 01784e0aef
am: 27766efeaa

Change-Id: I05282a22526f1f871dccfe9e1689aaa77603cd96
2016-09-09 01:40:51 +00:00
Dan Willemsen
27766efeaa Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd
am: 01784e0aef

Change-Id: I751acea9a09e67cb65954502cc562408d948a133
2016-09-09 01:38:22 +00:00
Dan Willemsen
5ad9ccaf2a Prevent Kati from seeing MAKEFLAGS
We never want Kati to see MAKEFLAGS, as forcefully overriding variables
is terrible. The variables in MAKEFLAGS are still available in the
environment, so if part of the build wants input from the user, it
should be explicitly checking for an environment variable or using ?=

This commit shouldn't actually change any behavior -- the version of
Kati checked into our tree doesn't actually read MAKEFLAGS (the latest
version does, which is why this change is necessary). We're also already
clearing MAKEFLAGS during makeparallel, so the USE_GOMA case already
doesn't pass through MAKEFLAGS.

Test: Manual $(warnings $(origin MYTEST) $(MYTEST)) with old and new Kati
Change-Id: I5e4ffa66b3539a539cc7a26da24645b11445c469
2016-09-08 17:14:43 -07:00
Dan Willemsen
061fa8c7e6 Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2 am: 4e3e6c76d0 am: e67d3d1c36
am: 4dc664081d

Change-Id: I89a0398a9209fe46ef0b81894e409cdf7700f262
2016-09-08 21:00:05 +00:00
Dan Willemsen
4dc664081d Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2 am: 4e3e6c76d0
am: e67d3d1c36

Change-Id: Iab2457c07acd730091dd120b4ad7ebdf7fafe062
2016-09-08 20:57:35 +00:00
Dan Willemsen
e67d3d1c36 Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2
am: 4e3e6c76d0

Change-Id: Iec477fd5002a486d266b2926b21f901f5c8abf30
2016-09-08 20:55:04 +00:00
Dan Willemsen
b2498a22c2 Merge "Blacklist the GOMACC_PATH environment variable" 2016-09-08 20:47:19 +00:00
Chih-hung Hsieh
6afe656b6d Merge "Define DEFAULT_TIDY_HEADER_DIRS." am: 9d66e2c2ef am: 84be3dc50a am: 59ac695071
am: e28fd9f2e4

Change-Id: I40f077e04438e2b3c54887d82a782af460304aa3
2016-09-08 20:42:34 +00:00
Chih-hung Hsieh
e28fd9f2e4 Merge "Define DEFAULT_TIDY_HEADER_DIRS." am: 9d66e2c2ef am: 84be3dc50a
am: 59ac695071

Change-Id: I3df291e91d5d4a222f0bebc9bbc7291a89ad5d79
2016-09-08 20:39:34 +00:00
Chih-hung Hsieh
59ac695071 Merge "Define DEFAULT_TIDY_HEADER_DIRS." am: 9d66e2c2ef
am: 84be3dc50a

Change-Id: I2d331c92195714935093171af16bfde0788cca43
2016-09-08 20:37:03 +00:00
Chih-hung Hsieh
9d66e2c2ef Merge "Define DEFAULT_TIDY_HEADER_DIRS." 2016-09-08 20:24:07 +00:00
Dan Willemsen
c4f595e88f Blacklist the GOMACC_PATH environment variable
The clang compiler wrapper will be looking for this environment
variable, but it should only ever be set by the `gomacc` in CC_WRAPPER.
Make sure that it isn't otherwise set in the environment.

Change-Id: I4b26c7183bc47f71dffa7dfcc2e5b08e840a11b1
2016-09-08 12:45:15 -07:00
Colin Cross
0f5fde97d5 Merge "Build symlinks for -host and -target phony modules" am: d81559e6ac am: cf94d1dbdc am: ed5343b8ac
am: 6cf278c499

Change-Id: I60f4aec1605681722f766b91cf5c730d2ed15d31
2016-09-07 22:28:12 +00:00
Colin Cross
6cf278c499 Merge "Build symlinks for -host and -target phony modules" am: d81559e6ac am: cf94d1dbdc
am: ed5343b8ac

Change-Id: I88fcdd916676801403767aa686c165691ef372e1
2016-09-07 22:09:53 +00:00
Colin Cross
ed5343b8ac Merge "Build symlinks for -host and -target phony modules" am: d81559e6ac
am: cf94d1dbdc

Change-Id: If14c8e7ca133f737638b48f70657903cca6d9a7e
2016-09-07 22:07:18 +00:00
Treehugger Robot
d81559e6ac Merge "Build symlinks for -host and -target phony modules" 2016-09-07 22:00:24 +00:00
Colin Cross
aaf888a09a Build symlinks for -host and -target phony modules
Move extra module dependencies like symlinks from dependencies of
$(my_register_name) to $(my_all_targets), and make $(my_register_name)
and other convenience phony modules depend on $(my_all_targets).  Move
$(LOCAL_MODULE)-host/-target to depend on $(my_all_targets) instead of
directly depending on the built and installed modules.

Change-Id: I3b093986db7a1bff118f1f2482275f0997a98fb6
2016-09-07 14:03:32 -07:00
Casey Dahlin
9a9dfa49b1 Merge "Add tool to copy files in to fat16 images" am: bfea84dabc am: f061b906e4 am: 1da082d2c5
am: 2ceedbee92

Change-Id: If1a692da6119a97ceb3ca25b07c06d823ebc6c5e
2016-09-07 20:18:53 +00:00
Casey Dahlin
2ceedbee92 Merge "Add tool to copy files in to fat16 images" am: bfea84dabc am: f061b906e4
am: 1da082d2c5

Change-Id: Ia13845de77d1750c7ba54de13d06ed0eb55b8ac9
2016-09-07 20:09:10 +00:00
Casey Dahlin
1da082d2c5 Merge "Add tool to copy files in to fat16 images" am: bfea84dabc
am: f061b906e4

Change-Id: Ia3988e59b82245ffa41b92a5df057cada1ac6154
2016-09-07 20:06:41 +00:00
Treehugger Robot
bfea84dabc Merge "Add tool to copy files in to fat16 images" 2016-09-07 19:51:06 +00:00
Chih-Hung Hsieh
0a33f65cc8 Define DEFAULT_TIDY_HEADER_DIRS.
Let clang-tidy report warnings in header files in the
system and current directories but not the external
and vendor directories.

Test: build with WITH_TIDY=1
Change-Id: I1723b8eb95948961fb7164a19989e0a926e5bf8a
2016-09-06 20:06:28 -07:00
Duane Sand
5e1558d542 Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c am: 7363b91cb1 am: c2793b97e9
am: ec26fd752e

Change-Id: Iaaa49605571302f8fccd597a23e0611204184667
2016-09-06 23:37:09 +00:00
Duane Sand
ec26fd752e Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c am: 7363b91cb1
am: c2793b97e9

Change-Id: I79f3a7c39f23a0f24cdacce3034ed9571bcc7faf
2016-09-06 23:06:24 +00:00
Duane Sand
c2793b97e9 Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c
am: 7363b91cb1

Change-Id: I5496223f82953429717dfb185b8ee34074fa11c4
2016-09-06 22:54:01 +00:00
Treehugger Robot
126ea5a55c Merge changes I65c3fa9a,Id1ea5e8b
* changes:
  Pair mips64r6 with mips32r2 on Aosp
  Allowing pairing mips64r6 with mips32r1 and r2
2016-09-06 22:38:40 +00:00
Dan Willemsen
c2ed592819 Merge "Use full path in symbols zip file" am: 72dcbeb4bc am: afb93b7b2f am: 6eece73fc7
am: 9457cbe8c1

Change-Id: Iea2b04eea4511c9e5db829a29baa994eaa6aa3ef
2016-09-06 22:22:38 +00:00
Dan Willemsen
9457cbe8c1 Merge "Use full path in symbols zip file" am: 72dcbeb4bc am: afb93b7b2f
am: 6eece73fc7

Change-Id: I0b04e840d2a21045ecd7e181dcb2dc6420c6c612
2016-09-06 22:08:52 +00:00
Dan Willemsen
6eece73fc7 Merge "Use full path in symbols zip file" am: 72dcbeb4bc
am: afb93b7b2f

Change-Id: Ia5fed8a3b237ca5d9d494d5b3000687f92933e35
2016-09-06 21:55:32 +00:00
Dan Willemsen
572deecbca Use full path in symbols zip file
This was accidentally changed when moving to soong_zip.

Change-Id: I5f889c3c83b6f888e765d4c35486576fa11f6945
2016-09-06 13:47:05 -07:00
Colin Cross
57546850da Merge "Remove HOST_PREFER_32_BIT" am: 182ff5e2e7 am: a128976547 am: 0ab4eb9734
am: 3de35b8ada

Change-Id: Id379d498af36fd393cfe22ddb54d3b5e61accd2c
2016-09-03 00:47:21 +00:00
Colin Cross
3de35b8ada Merge "Remove HOST_PREFER_32_BIT" am: 182ff5e2e7 am: a128976547
am: 0ab4eb9734

Change-Id: I5834da777a75fb0c269de886f0233e8796c6aee7
2016-09-03 00:38:55 +00:00
Colin Cross
0ab4eb9734 Merge "Remove HOST_PREFER_32_BIT" am: 182ff5e2e7
am: a128976547

Change-Id: I752f079e3a3b68a28ed49bb577b233dd11c26d77
2016-09-03 00:35:54 +00:00
Colin Cross
182ff5e2e7 Merge "Remove HOST_PREFER_32_BIT" 2016-09-03 00:29:41 +00:00
Keun Soo Yim
89941f56d9 Merge "delete vts.mk (which is moved to test/vts)" 2016-09-02 22:49:30 +00:00
Vishwath Mohan
25cef10a36 Merge "Create sub-directory for fuzzers under nativetest." am: 0464662888 am: fc7f43954b am: a2c3dd313a
am: ae24a86e96

Change-Id: I7a477c8620e35ace21bbe23b646213a76be33eb7
2016-09-02 21:49:11 +00:00
Vishwath Mohan
ae24a86e96 Merge "Create sub-directory for fuzzers under nativetest." am: 0464662888 am: fc7f43954b
am: a2c3dd313a

Change-Id: I2a6674f0b5ba9aa1ff090d76384acebb4b6349b2
2016-09-02 21:46:11 +00:00
Vishwath Mohan
a2c3dd313a Merge "Create sub-directory for fuzzers under nativetest." am: 0464662888
am: fc7f43954b

Change-Id: I3e9b1ebeb66c8e2d7ab7cb6ef8d5fa281ca474cd
2016-09-02 21:43:40 +00:00
Casey Dahlin
29e2b21c0a Add tool to copy files in to fat16 images
fat16copy.py can be used to copy files or directories in to the root of
a fat16 image.

Usage: fat16copy <image> <file> [<file> ...]

Test: Used to compose a Raspberry Pi 3 boot image
Bug: 28912590
Change-Id: I29c9eec3786e2c5cc94f9a160360bac850809a93
2016-09-02 14:13:47 -07:00
Vishwath Mohan
b6baba059b Create sub-directory for fuzzers under nativetest.
This CL changes BUILD_FUZZ_TEST to generate binaries in a
sub-directory called fuzzers/ under the nativetest directory. This
allows fuzzers to be distinguished from the other native tests and
makes it easier to perform automated fuzz-testing.

Bug: 25714111
Change-Id: I452e43f15728ec9168dd44776b6ffcea6037fa7f
2016-09-02 13:25:59 -07:00
Colin Cross
70e0ac6bc1 Remove HOST_PREFER_32_BIT
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.

Change-Id: I874f89c7d1e9cd8c9d4c879048d81a4362ce4dce
2016-09-02 13:20:52 -07:00
Keun Soo Yim
a942dc8433 delete vts.mk (which is moved to test/vts)
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
2016-09-02 11:43:43 -07:00
Colin Cross
e1402e4d47 Merge "Don't double-wrap with gomacc" am: b7a12806b1 am: 70683c3ccf am: 5c16219854
am: e3525d90d1

Change-Id: I593517aa04c80401bfbdfb0bfc3de11cf2497909
2016-09-01 16:18:57 +00:00
Colin Cross
e3525d90d1 Merge "Don't double-wrap with gomacc" am: b7a12806b1 am: 70683c3ccf
am: 5c16219854

Change-Id: I5c90cd78c4644a93d95158063577964f55da02ec
2016-09-01 16:15:37 +00:00
Colin Cross
5c16219854 Merge "Don't double-wrap with gomacc" am: b7a12806b1
am: 70683c3ccf

Change-Id: I041bdcc7d533109749df3b2c07597c098ecd8821
2016-09-01 16:12:25 +00:00
Colin Cross
b7a12806b1 Merge "Don't double-wrap with gomacc" 2016-09-01 15:59:38 +00:00
Colin Cross
17470c1f0f Merge "Create more shortcut phony targets" am: 44303e9f26 am: dc56268641 am: 1a276819a1
am: 825ea362b1

Change-Id: I9a2986a714493d3a51920977269a247d3596829d
2016-08-31 22:47:18 +00:00
Keun Soo Yim
19b2ea86fb Merge "include VTS packaging task files" 2016-08-31 22:15:50 +00:00
Colin Cross
825ea362b1 Merge "Create more shortcut phony targets" am: 44303e9f26 am: dc56268641
am: 1a276819a1

Change-Id: Ifaeb152d2fa108ed64fa4652841d4c13c1d9f5fe
2016-08-31 21:27:54 +00:00
Colin Cross
1a276819a1 Merge "Create more shortcut phony targets" am: 44303e9f26
am: dc56268641

Change-Id: Ic33ee46b73f6f56646ad8a6b69fef023e510cad0
2016-08-31 21:23:28 +00:00
Colin Cross
44303e9f26 Merge "Create more shortcut phony targets" 2016-08-31 21:16:22 +00:00
Colin Cross
02ca508bb3 Merge "Enable goma in soong" am: 753ed863c5 am: cc7f1318e9 am: 00570bbbb3
am: 85b2b926de

Change-Id: If32e310b7935c70b233973afda2724566ed51d91
2016-08-31 21:03:42 +00:00
Colin Cross
44005d41dc Don't double-wrap with gomacc
config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER.  Only export it from make so gomacc doesn't appear twice on
the command line.

Bug: 31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
2016-08-31 13:51:16 -07:00
Colin Cross
85b2b926de Merge "Enable goma in soong" am: 753ed863c5 am: cc7f1318e9
am: 00570bbbb3

Change-Id: I0344c8a2c9d2a34f36ee5d68be5ca5ebec76f60a
2016-08-31 20:27:02 +00:00
Colin Cross
00570bbbb3 Merge "Enable goma in soong" am: 753ed863c5
am: cc7f1318e9

Change-Id: I329831ecf9e4b38dbf8d7fdb76a9bba3288f5b70
2016-08-31 20:21:18 +00:00
Colin Cross
5a5befb7c0 Enable goma in soong
Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.

Bug: 31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
2016-08-31 09:48:21 -07:00
Dan Willemsen
27a1f69e44 Merge "Simplify Soong bootstrapping" am: 2e5dc07c1f am: 67dc1c2e4c am: 4b6275848c
am: 458724219a

Change-Id: Ia31a4a38deb0215fc1278ad66f52a82405260c13
2016-08-31 16:33:11 +00:00
Keun Soo Yim
199a710f73 include VTS packaging task files
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
2016-08-31 09:20:51 -07:00
Dan Willemsen
458724219a Merge "Simplify Soong bootstrapping" am: 2e5dc07c1f am: 67dc1c2e4c
am: 4b6275848c

Change-Id: Iaf5ea3e651e025701a8cedf091c18d4130f97947
2016-08-31 16:17:29 +00:00
Dan Willemsen
4b6275848c Merge "Simplify Soong bootstrapping" am: 2e5dc07c1f
am: 67dc1c2e4c

Change-Id: I9ba778c1d632e7659cf2343078bb6778a31ad13f
2016-08-31 16:14:28 +00:00
Dan Willemsen
0533e4df40 Simplify Soong bootstrapping
Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.

Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
2016-08-31 00:58:12 -07:00
Colin Cross
b43204b2ac Create more shortcut phony targets
Create shortcut phony targets for the host and device halves of
modules.

Change-Id: I1cf3a49118db830d78a1b83b2177715175949871
2016-08-30 16:16:32 -07:00
Dan Willemsen
b526732b1b Merge "Check USE_GOMA consistently" am: 049dd57872 am: 60204ae5ba am: f1d3d9aab7
am: 9b02b82945

Change-Id: Iba34cf7f5ef922a7cec28a7274b78af004de745f
2016-08-30 02:29:23 +00:00
Dan Willemsen
9b02b82945 Merge "Check USE_GOMA consistently" am: 049dd57872 am: 60204ae5ba
am: f1d3d9aab7

Change-Id: I0a943e77cf07728850b2547334a2a9568f47457c
2016-08-30 01:21:43 +00:00
Dan Willemsen
f1d3d9aab7 Merge "Check USE_GOMA consistently" am: 049dd57872
am: 60204ae5ba

Change-Id: I4bb034cecfab78d3a4b5683cd356c6230a04cc7a
2016-08-30 01:19:21 +00:00
Evgenii Stepanov
202c7a786c Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG.
Bug: 22033465

Change-Id: Ie011f888f55a2cfb5c943070a3844cb541812afe
2016-08-29 15:06:57 -07:00
Pirama Arumuga Nainar
4e0c2b2dda Merge "Switch to prebuilt clang-3217047" am: 3500ddfe1b am: c3c8abdf2a am: c328dd288c
am: 944bb9aec5

Change-Id: I7a799b03d648341439cae65cff9aa5392e5c37a7
2016-08-29 20:44:22 +00:00
Treehugger Robot
049dd57872 Merge "Check USE_GOMA consistently" 2016-08-29 20:36:00 +00:00
Pirama Arumuga Nainar
944bb9aec5 Merge "Switch to prebuilt clang-3217047" am: 3500ddfe1b am: c3c8abdf2a
am: c328dd288c

Change-Id: I22502731f28d8875497a2c520e9947d3d9983ff3
2016-08-29 20:02:28 +00:00
Pirama Arumuga Nainar
c328dd288c Merge "Switch to prebuilt clang-3217047" am: 3500ddfe1b
am: c3c8abdf2a

Change-Id: I6cba69a16581e322342a577c05b1fff051db53ab
2016-08-29 19:58:36 +00:00
Pirama Arumuga Nainar
3500ddfe1b Merge "Switch to prebuilt clang-3217047" 2016-08-29 19:38:34 +00:00
Dan Willemsen
937cef48eb Check USE_GOMA consistently
Currently, the only way to properly disable goma is to unset USE_GOMA.
If you set USE_GOMA=false, we won't turn on goma, but we'll pass -j500
to ninja.

Test: USE_GOMA={x,false} m -j48 showcommands (inspect)
Change-Id: I6b327d08ebadbe614a3bf7646fd597054bbfaaa2
2016-08-27 18:33:11 -07:00
Dan Willemsen
cfa84e90bd Merge "Identify modules ready to be converted to Soong" am: c6bada8acd am: 6596082d00 am: 52438f9fcf
am: b2bf9125f2

Change-Id: Ib249a1cdd546cf3bafed7002ac9e05080f55715d
2016-08-26 23:28:07 +00:00
Dan Willemsen
b2bf9125f2 Merge "Identify modules ready to be converted to Soong" am: c6bada8acd am: 6596082d00
am: 52438f9fcf

Change-Id: I3d2aec41ae42b05006cea2837968174edd97817a
2016-08-26 22:54:34 +00:00
Dan Willemsen
52438f9fcf Merge "Identify modules ready to be converted to Soong" am: c6bada8acd
am: 6596082d00

Change-Id: I2e814051643c339054ccc02ae2823a6c2fd80e46
2016-08-26 22:52:02 +00:00
Treehugger Robot
c6bada8acd Merge "Identify modules ready to be converted to Soong" 2016-08-26 22:37:19 +00:00
Pirama Arumuga Nainar
6290aac57a Switch to prebuilt clang-3217047
Bug: http://b/30421084
Change-Id: I41acd016992a0c5043b6ea018f205fad44c88b9e
Test: Tested build, boot and common usage for several devices in AOSP
and internal branch.
2016-08-26 21:57:29 +00:00
Dan Willemsen
fc92fb2b9b Identify modules ready to be converted to Soong
The output will be in the `m dist` results as soong_to_convert.txt, or
can be built using:

  $ m $OUT/soong_to_convert.txt

The output is a list of modules that are probably ready to convert to
Soong:

  # Blocked on Module (potential problems)
           283 libEGL (srcs_dotarm)
           246 libicuuc (dotdot_incs dotdot_srcs)
           221 libspeexresampler
           215 libcamera_metadata
               ...
             0 zram-perf (dotdot_incs)

The number at the beginning of the line shows how many native modules
depend on that module.

All of their dependencies have been satisfied, and any potential
problems that Make can detect are listed in parenthesis after the
module:

  dotdot_srcs: LOCAL_SRC_FILES contains paths outside $(LOCAL_PATH)
  dotdot_incs: LOCAL_C_INCLUDES contains paths include '..'
  srcs_dotarm: LOCAL_SRC_FILES contains source files like <...>.c.arm
  aidl: LOCAL_SRC_FILES contains .aidl sources
  dbus: LOCAL_SRC_FILES contains .dbus-xml sources
  objc: LOCAL_SRC_FILES contains Objective-C sources
  proto: LOCAL_SRC_FILES contains .proto sources
  rs: LOCAL_SRC_FILES contains renderscript sources
  vts: LOCAL_SRC_FILES contains .vts sources

Not all problems can be discovered, but this is a starting point.

Change-Id: I45674fe93fd267d4d1fb0bc3bc9aa025e20c5ac6
2016-08-26 13:33:31 -07:00
Adam Seaton
bc33274781 Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef am: a43f790608
am: 569906e169

Change-Id: I64a7335ed65d36ce6de90112085340af633ab04f
2016-08-26 03:25:26 +00:00
Adam Seaton
78fb4b616f Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef am: 89c03f5748
am: 57866742e7

Change-Id: I378f4a0494c2b067d41676becf35663d9155cb1f
2016-08-26 03:16:47 +00:00
Adam Seaton
569906e169 Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef
am: a43f790608

Change-Id: I0d7feb17c8f8fd74c73714657417ba03cab74f75
2016-08-26 03:14:16 +00:00
Adam Seaton
89c03f5748 Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
am: c63e4295ef

Change-Id: I9cb5cbb053ebb79b08a0d75bff21932bb8eaee33
2016-08-26 03:11:47 +00:00
Adam Seaton
a43f790608 Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
am: c63e4295ef

Change-Id: Ia7286a170445e19aec836432421be970691ab6b0
2016-08-26 03:11:47 +00:00
Adam Seaton
c63e4295ef Update comments around PLATFORM_SECURITY_LEVEL
(nyc-dev)
Bug: 29881091

Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
2016-08-25 19:46:06 -07:00
Colin Cross
4c9626c756 Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong" am: fe3163400e am: a7553ae1ce am: 79e4dff44c
am: d208a577f4

Change-Id: I1587d4897b58c1240c326af62bfdc3eb60bd1c06
2016-08-26 01:34:25 +00:00
Colin Cross
d208a577f4 Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong" am: fe3163400e am: a7553ae1ce
am: 79e4dff44c

Change-Id: I5d92ea03a46d9a3bb5e475b4d1f26ef3de68bfd2
2016-08-26 00:12:17 +00:00
Colin Cross
79e4dff44c Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong" am: fe3163400e
am: a7553ae1ce

Change-Id: I0fe9b722531df9e9ee1367605e418d91b986f3ba
2016-08-26 00:09:04 +00:00
Colin Cross
76c4533899 Export TARGET_PREFER_32_BIT_EXECUTABLES to soong
Change-Id: I1427d88c7539c5ed0c4c238bad4a28f73d29ef0f
2016-08-25 14:49:17 -07:00
Colin Cross
90b18af80d Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2 am: f9ed0fffe4 am: 7d26f58c09
am: 118f909d21

Change-Id: I8365a16f274644b38cb4352249376fc84a03670e
2016-08-25 21:18:42 +00:00
Colin Cross
118f909d21 Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2 am: f9ed0fffe4
am: 7d26f58c09

Change-Id: I0b2c5683a90ee2a473d5ae5d5c32b902e087f5fc
2016-08-25 20:52:16 +00:00
Colin Cross
7d26f58c09 Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2
am: f9ed0fffe4

Change-Id: Idfc6453e8581b58fbc584f2a7c5d0fd8b605b805
2016-08-25 20:49:45 +00:00
Colin Cross
6f1cf129f2 Merge "Install symlinks when using shortcut phony targets" 2016-08-25 20:39:31 +00:00
Chih-hung Hsieh
08a4f17004 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441 am: 5c2ca39c58 am: 920f36ad97
am: 385c2af183

Change-Id: I494a02910f420d099ecdd9ddd87ac87629399dcf
2016-08-25 02:46:22 +00:00
Chih-hung Hsieh
385c2af183 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441 am: 5c2ca39c58
am: 920f36ad97

Change-Id: I78ee24eda973aa9b5290cdfbf62c6cc4faa174c2
2016-08-25 02:40:28 +00:00
Chih-hung Hsieh
920f36ad97 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441
am: 5c2ca39c58

Change-Id: I99de763757298270f6ce4cc124cc6ead840ace02
2016-08-25 02:36:57 +00:00
Chih-hung Hsieh
a9ee94f441 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." 2016-08-25 02:24:32 +00:00
Colin Cross
6d34b61bd3 Install symlinks when using shortcut phony targets
Make symlinks an order-only dependency of the module name phony target
so that they get installed with make module or make MODULES-IN-path.

Test: mmma -j art/dalvikvm, remove symlink in $OUT and retry
Change-Id: Iae472a1c8fa1e8386cc9556cfe819bd4fca99428
2016-08-24 15:24:29 -07:00
Yohann Roussel
4253f35dbb Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74 am: 51403950b3
am: 760ece009b

Change-Id: I74a694593cc3937a919346c4dc0923883c85beea
2016-08-24 10:04:44 +00:00
Yohann Roussel
760ece009b Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74
am: 51403950b3

Change-Id: I59906380334fd96d70044b7d5253ea703ab08690
2016-08-24 09:54:54 +00:00
Yohann Roussel
51403950b3 Merge "Allow selection of prebuilts min sdk" am: 624619d4d0
am: 1d7e0f2c74

Change-Id: I54d5035cecbfa6785a68c9d454ffb27a5e8346cd
2016-08-24 09:52:28 +00:00
Yohann Roussel
1d7e0f2c74 Merge "Allow selection of prebuilts min sdk"
am: 624619d4d0

Change-Id: I54df2acb3003c0222b3f3d909d3f9c80dfda493d
2016-08-24 09:50:29 +00:00
Yohann Roussel
624619d4d0 Merge "Allow selection of prebuilts min sdk" 2016-08-24 09:39:30 +00:00
Chih-Hung Hsieh
b9ea8d191d Suppress clang-tidy checks in frameworks/compile/mclinker.
Too many warnings need to wait for upstream changes.
Test: build with WITH_TIDY=1.

Change-Id: I0b1272049ad757670182668db130512a538b3096
2016-08-23 11:07:19 -07:00
Alistair Strachan
7390ef5553 Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.

To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.

(cherry-picked from AOSP commit 5ff9c81b6c)

Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
2016-08-22 19:39:25 -07:00
Casey Dahlin
5d58dc276a Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736 am: 14aa63a52a am: 75db430a08
am: d1584a5d77

Change-Id: Ia7497f943aa68021d569e025472cffb6d2d85a2b
2016-08-23 01:10:55 +00:00
Casey Dahlin
d1584a5d77 Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736 am: 14aa63a52a
am: 75db430a08

Change-Id: I590c6ef761fcb75a16bc1b87f0274913206bbca1
2016-08-23 01:05:51 +00:00
Casey Dahlin
75db430a08 Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736
am: 14aa63a52a

Change-Id: If2ef06aa3c0b77506ccd7384577497d2a49456bc
2016-08-23 01:01:18 +00:00
Casey Dahlin
14aa63a52a Merge "List partition_table.bpt as an output of running bpttool"
am: aba93cf736

Change-Id: Ib986d3551a2bfff5ce813139380378b11dd84d82
2016-08-23 00:56:19 +00:00
Casey Dahlin
04d15dd9a3 List partition_table.bpt as an output of running bpttool
Change-Id: I8bb1e03e451bf148e421ecac346bf20ce5d4695b
Test: Verified builds can now depend on partition_table.bpt
Bug: 30971990
2016-08-22 16:00:39 -07:00
Yohann Roussel
5960c54664 Allow selection of prebuilts min sdk
Bug: 30966099

Change-Id: I55128d5a321bd65b4e12b90afbf7efe8ccb35829
2016-08-22 09:54:32 +02:00
TreeHugger Robot
a2071052e8 Merge "aux: allow non-clang toolchains for AUX builds" 2016-08-19 17:43:50 +00:00
Alexey Polyudov
65d7a34b85 aux: allow non-clang toolchains for AUX builds
Change-Id: I38fcc0ad66cadd1f6008169fb1c1baea77734695
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2016-08-19 09:06:36 -07:00
Adam Seaton
6e4a224227 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433
am: 68fede2142

Change-Id: I7c479cc20694085d70c6c6f6840e0ddc6f16fdc0
2016-08-18 23:05:25 +00:00
Adam Seaton
4249783848 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
am: 5d6ad4a9ab

Change-Id: I4e854f70d52f87cb809c59c6d73b4f5084bdba87
2016-08-18 23:05:24 +00:00
Adam Seaton
04c54f1b65 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433 am: 68fede2142 am: 40a4e23824
am: fec3ff0a40

Change-Id: I4121807145263efa5be6911434d691c9e88d2747
2016-08-18 22:24:27 +00:00
Adam Seaton
fec3ff0a40 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433 am: 68fede2142
am: 40a4e23824

Change-Id: Id4f4ae211b59b9e0e3e22745a63ec39822a8d95f
2016-08-18 22:21:19 +00:00
Adam Seaton
40a4e23824 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433
am: 68fede2142

Change-Id: I6e4e41743108647a00e5a4d93bd3aea9a5ead6ca
2016-08-18 22:17:59 +00:00
Adam Seaton
7d33fae097 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433
am: 68fede2142

Change-Id: Ifc920c16d87b0076acefd8ce7aedb3ded831e633
2016-08-18 22:17:58 +00:00
Adam Seaton
68fede2142 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88
am: 35e3465433

Change-Id: Ie52eeb02bdfa1f17f3f584ec7fd03c274008037f
2016-08-18 22:14:18 +00:00
Adam Seaton
35e3465433 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b
am: b93fd61d88

Change-Id: I759c475cf971ef5eff39a12b11277338c4823696
2016-08-18 22:10:48 +00:00
Adam Seaton
b93fd61d88 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
am: eacfc7749b

Change-Id: If1da1eb56de73999837f681443e0722b3edd5ee4
2016-08-18 22:07:48 +00:00
Adam Seaton
eacfc7749b Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
am: bb45bd20e9

Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
2016-08-18 22:04:24 +00:00
Adam Seaton
4245c26d51 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831 am: 5d6ad4a9ab am: 18bd0c1c17
am: 2ec1dfaa09

Change-Id: I482a33db248b832219c9f2a8bc2c125223c0434f
2016-08-18 21:25:44 +00:00
Adam Seaton
2ec1dfaa09 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831 am: 5d6ad4a9ab
am: 18bd0c1c17

Change-Id: I6506f2dff265241d1b01020d34a825b2601870af
2016-08-18 21:22:31 +00:00
Adam Seaton
234787512c Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
am: 5d6ad4a9ab

Change-Id: Ia74f7c457ab2b8df376a4501713243cd8506140a
2016-08-18 21:19:13 +00:00
Adam Seaton
18bd0c1c17 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
am: 5d6ad4a9ab

Change-Id: I4d9d39bf9763b16eeb51caffc215939982e1bd6d
2016-08-18 21:19:13 +00:00
Adam Seaton
5d6ad4a9ab Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44
am: 7d5d729831

Change-Id: Id24a8f9d8ae01587fd402839a41b6205efa4352e
2016-08-18 21:12:43 +00:00
Adam Seaton
bb45bd20e9 Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)

b/30946906

Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
2016-08-18 14:11:04 -07:00
Adam Seaton
7d5d729831 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea
am: 95e55dce44

Change-Id: I379e5cc3ed69561d7bb22d866af2803cb28b0060
2016-08-18 21:09:12 +00:00
Adam Seaton
95e55dce44 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
am: e977aadfea

Change-Id: I74de2d5d5b8317805eddb5ce2fd0430c504c4dd1
2016-08-18 21:05:12 +00:00
Adam Seaton
e977aadfea Update Security String to 2016-10-01 to platform and CTS for October Security
am: cb60b2dedb

Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
2016-08-18 21:01:43 +00:00
Adam Seaton
cb60b2dedb Update Security String to 2016-10-01 to platform and CTS for October Security
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
2016-08-18 17:39:31 +00:00
Chih-Hung Hsieh
cef6ce03c9 Merge "Clarify default tidy check lists." am: ce4c49c2f2 am: 94a2c5f6b7 am: fba612f125
am: 7e2a95ff2f

Change-Id: I3f8ec4c49ada8dd90ccc312054d85a0d6de8c7b2
2016-08-17 18:51:03 +00:00
Dan Willemsen
bbbdb91f89 Merge "Support dist-ing the userdatatarball" am: 9abbeb3d8f am: faac87dd9a am: 9d33c5fdb4
am: 8542e5ce8e

Change-Id: I4cc42af602fd1525bd65a347c7c701819c1d851e
2016-08-17 18:51:02 +00:00
Chih-Hung Hsieh
d67e590818 Merge "Remove spaces in tidy check list." am: e7bca12466 am: 34c8c0ac33 am: 2be0f9bdbc
am: 13fa5670de

Change-Id: I09a3e76eb84e40d77bc2fe8b3eee697bc2b6cdbf
2016-08-17 18:51:00 +00:00
Chih-Hung Hsieh
7e2a95ff2f Merge "Clarify default tidy check lists." am: ce4c49c2f2 am: 94a2c5f6b7
am: fba612f125

Change-Id: I7c7bdc9ea7264377732c998eef772630750652cc
2016-08-17 18:24:28 +00:00
Dan Willemsen
8542e5ce8e Merge "Support dist-ing the userdatatarball" am: 9abbeb3d8f am: faac87dd9a
am: 9d33c5fdb4

Change-Id: Ic188e736aff86bd66058ffd120ca1369d0422526
2016-08-17 18:24:27 +00:00
Chih-Hung Hsieh
13fa5670de Merge "Remove spaces in tidy check list." am: e7bca12466 am: 34c8c0ac33
am: 2be0f9bdbc

Change-Id: I69def6f5751b0192c0fc5785633cdfce13c32a21
2016-08-17 18:24:27 +00:00
Chih-Hung Hsieh
fba612f125 Merge "Clarify default tidy check lists." am: ce4c49c2f2
am: 94a2c5f6b7

Change-Id: I7b0bc11c284b07c1c9826a6cadcd098dcd5668e9
2016-08-17 18:00:08 +00:00
Dan Willemsen
9d33c5fdb4 Merge "Support dist-ing the userdatatarball" am: 9abbeb3d8f
am: faac87dd9a

Change-Id: If7c93a8c57db6bf6c5a329f3419086d5affe7089
2016-08-17 18:00:07 +00:00
Chih-Hung Hsieh
2be0f9bdbc Merge "Remove spaces in tidy check list." am: e7bca12466
am: 34c8c0ac33

Change-Id: Ibcd65e9fac13f49780ccfb25891d0b26b1e0c4cf
2016-08-17 18:00:07 +00:00
Chih-Hung Hsieh
94a2c5f6b7 Merge "Clarify default tidy check lists."
am: ce4c49c2f2

Change-Id: If0641d286d6f1fefa871a18c21282f4fcd10d8a1
2016-08-17 17:48:56 +00:00
Dan Willemsen
faac87dd9a Merge "Support dist-ing the userdatatarball"
am: 9abbeb3d8f

Change-Id: I0dac58c2eed164247fe595da6897ff00f0786e18
2016-08-17 17:48:54 +00:00
Chih-Hung Hsieh
34c8c0ac33 Merge "Remove spaces in tidy check list."
am: e7bca12466

Change-Id: I852d42992bc1ddb0a17dd1dcf03cf25f1d114552
2016-08-17 17:48:52 +00:00
Treehugger Robot
ce4c49c2f2 Merge "Clarify default tidy check lists." 2016-08-17 04:56:07 +00:00
Dan Willemsen
9abbeb3d8f Merge "Support dist-ing the userdatatarball" 2016-08-17 00:58:18 +00:00
Dan Willemsen
69af2e4102 Support dist-ing the userdatatarball
So that we can get to the contents of userdata from the build server
without extracting the image.

Bug: 27719200
Test: m userdatatarball dist
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
2016-08-16 23:41:50 +00:00
Chih-Hung Hsieh
ba646253ce Remove spaces in tidy check list.
This will allow spaces in LOCAL_TIDY_CHECKS.

Bug: http://b/27779618
Change-Id: I6f9b133220e49b2581a06d2fd9083a1d6b7badca
Test: build with WITH_TIDY=1.
2016-08-16 16:27:30 -07:00
Chih-Hung Hsieh
97032ccda3 Clarify default tidy check lists.
* Sort all enabled and disabled checks.
* Disable google-default-arguments for external and vendor projects.

Bug: http://b/27779618
Change-Id: I59e6eaf84fddf54bd89eb71a2189d73b64968057
Test: build with WITH_TIDY=1.
2016-08-16 15:47:56 -07:00
Andriy Naborskyy
c855ad1ec4 board-specific prep recovery imagefix recovery size issue am: 5310557e3a am: 7754c958a6
am: 807729c45b

Change-Id: I667f5d81be4f08c7a4fb66f751521ca23b391660
2016-08-16 14:19:34 +00:00
Andriy Naborskyy
807729c45b board-specific prep recovery imagefix recovery size issue am: 5310557e3a
am: 7754c958a6

Change-Id: Ie2c88a2bdec4ed483930c9587d7a9eb6e1688664
2016-08-16 14:15:39 +00:00
Andriy Naborskyy
7754c958a6 board-specific prep recovery imagefix recovery size issue
am: 5310557e3a

Change-Id: I8e1f488a841159cd351f6e9a3d29bd87486ca5a0
2016-08-16 14:11:19 +00:00
Andriy Naborskyy
cface8c009 Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev 2016-08-16 14:06:46 +00:00
Android Build Merger (Role)
7e87afa866 Merge "Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d am: 9fc9cac0ac am: 0e642c3e55 am: 7d72b5ef71" 2016-08-15 21:31:34 +00:00
TreeHugger Robot
7f78c2f60e Merge "Add split support for AAPT2" 2016-08-15 21:31:22 +00:00
Dan Willemsen
df57faec9a Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d am: 9fc9cac0ac am: 0e642c3e55
am: 7d72b5ef71

Change-Id: I81c2a1f4bff1a933f30131a8dce84004052c9f9e
2016-08-15 21:31:00 +00:00
Dan Willemsen
7d72b5ef71 Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d am: 9fc9cac0ac
am: 0e642c3e55

Change-Id: Ic608a11b5b7ccf78f75bbf4ce7086ed92e1b9e14
2016-08-15 21:26:31 +00:00
Dan Willemsen
0e642c3e55 Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d
am: 9fc9cac0ac

Change-Id: I36aa2dcfca3b0a57c83291d1df07afb50bf3dc92
2016-08-15 21:21:32 +00:00
Dan Willemsen
9fc9cac0ac Merge "Fix GET-INSTALL-PATH to work with Soong"
am: 6b9aa6938d

Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
2016-08-15 21:17:33 +00:00
Dan Willemsen
6b9aa6938d Merge "Fix GET-INSTALL-PATH to work with Soong" 2016-08-15 21:07:53 +00:00
Adam Lesinski
4c45205c99 Add split support for AAPT2
AAPT2 allows the declaration of a split path, so that build systems
don't need to guess the auto-generated name.

Construct the split path we want from the configurations passed in to
LOCAL_PACKAGE_SPLITS.

Bug:30445078
Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
2016-08-15 13:13:23 -07:00
Ian Pedowitz
5b87d0e41f N-DR/N-MR1 is 7.1 am: d0528b4463
am: 719881f2a0

Change-Id: I8ca090fa86eda9be9be4fc4e17f74fe2cb30e52f
2016-08-15 17:55:49 +00:00