Commit Graph

10395 Commits

Author SHA1 Message Date
Dan Willemsen
5da565a85a Merge changes Ib6ffcc38,Ia58e6bc1
am: 3068a85962

Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
2016-06-16 15:50:46 +00:00
Dan Willemsen
b097fbed0a Check that NDK-built modules only link to NDK-built modules
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.

Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
2016-06-15 20:22:19 -07:00
Dan Willemsen
dd5a5d328b Add macros for printing pretty warnings/errors in rules
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
2016-06-15 20:22:19 -07:00
Dan Willemsen
cf771ed98f Merge \"Fix kati --no_ignore_dirty usage\"
am: a6f510c776

Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
2016-06-15 22:55:02 +00:00
Dan Willemsen
3cd95c708d Merge \"Forbid libstdc++ on Linux and Darwin\"
am: 7fba3347b9

Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
2016-06-15 22:54:59 +00:00
Treehugger Robot
a6f510c776 Merge "Fix kati --no_ignore_dirty usage" 2016-06-15 22:41:32 +00:00
Dan Willemsen
3773b45c3b Fix kati --no_ignore_dirty usage
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.

Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
2016-06-15 14:55:58 -07:00
Dan Willemsen
327fa9c411 Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.

Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
2016-06-15 13:41:45 -07:00
Dan Willemsen
ffb643e487 Merge \"Use more prebuilt build-tools\"
am: 6c0c720389

Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
2016-06-14 22:28:02 +00:00
Dan Willemsen
7c2d228701 Use more prebuilt build-tools
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.

For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.

For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.

Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
2016-06-14 13:50:38 -07:00
Jeff Hao
7d49d21ac5 Skip uses-library check for preopted apps.
am: b00263f96a

Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
2016-06-14 02:15:53 +00:00
Yabin Cui
494c2b5ebc Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455
am: bebdc16a68

Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
2016-06-14 01:24:05 +00:00
Jeff Hao
00b75bc41a Skip uses-library check for preopted apps.
Bug: 26880306

(cherry-picked from commit b00263f96a)

Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
2016-06-13 18:14:27 -07:00
Jeff Hao
b00263f96a Skip uses-library check for preopted apps.
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13 17:32:06 -07:00
Yabin Cui
bebdc16a68 Merge \"Add option to link static lite protobuf library.\"
am: e6fae50455

Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
2016-06-14 00:25:05 +00:00
Yabin Cui
e6fae50455 Merge "Add option to link static lite protobuf library." 2016-06-14 00:16:34 +00:00
David Zeuthen
a787117cc5 Merge \\"bvb: Update path to key since repo was moved.\\" am: 8b3b1727da
am: 8ab7487660

Change-Id: I04b9b35c392b6e99b15f4c78358c70c9a9794532
2016-06-13 16:06:54 +00:00
David Zeuthen
8ab7487660 Merge \"bvb: Update path to key since repo was moved.\"
am: 8b3b1727da

Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2
2016-06-13 16:03:11 +00:00
David Zeuthen
bca24302bb bvb: Update path to key since repo was moved.
We recently moved Brillo verified boot from system/bvb to external/bvb
so update the path accordingly.

TEST=Build with 'BOARD_BVB_ENABLE := true' succeeds.
BUG=29099910

Change-Id: I66f3b90e23d6b2afc09f81af571ede7b573325e9
2016-06-13 11:26:26 -04:00
Yohann Roussel
9530d9131c Merge \\"Do not force turn off of Jack warning\\" am: 0a26fc0ace
am: 5185323de9

Change-Id: I054396d9bdb88822ca75be61a88e18f08213242d
2016-06-13 14:48:53 +00:00
Yohann Roussel
5185323de9 Merge \"Do not force turn off of Jack warning\"
am: 0a26fc0ace

Change-Id: Iddfabd648876281596bc8c571968d18589f1f581
2016-06-13 14:44:56 +00:00
Yohann Roussel
0a26fc0ace Merge "Do not force turn off of Jack warning" 2016-06-13 14:33:48 +00:00
Vikas Marwaha
98dce87fe1 resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
2016-06-09 05:46:40 +00:00
Vikas Marwaha
07886f17af Merge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level.\"
am: e5c1af2dd0

Change-Id: I0dd1cd7ebe6b7ede5f019566d844b12fe40fb40c
2016-06-09 02:38:50 +00:00
Vikas Marwaha
e5c1af2dd0 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level." 2016-06-09 02:30:57 +00:00
Dan Willemsen
74da7c9272 Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am: a8d13592ac
am: d8210177af

Change-Id: If466674f33ba7d98a0f8da249bc0dc57efdcf621
2016-06-08 21:17:05 +00:00
Dan Willemsen
d8210177af Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
am: a8d13592ac

Change-Id: Ic1cdfd510ff26c279a2628b58c3a1db7ef172b5c
2016-06-08 21:14:36 +00:00
Yohann Roussel
bf17172521 Do not force turn off of Jack warning
When ANDROID_JACK_EXTRA_ARGS is defined there is no reason to still turn
off those warnings.

Change-Id: Ic7ac02c72ed3b7b0eaca9394c9fc7d92d5dfa871
2016-06-08 17:00:09 +02:00
Dan Willemsen
6731b495ca Rewrite LDLIBS and SHARED_LIBRARIES
LOCAL_LDLIBS was the only correct way to use NDK libraries, but few used
it correctly. It also often got confused with LOCAL_LDFLAGS, so move the
flags to the correct variable.

For binaries that weren't using the NDK (empty LOCAL_SDK_VERSION), it
was never valid to use LOCAL_LDLIBS, as dependencies would not be
properly set up, and could lead to random build failures. So convert any
-l linker flags to using LOCAL_SHARED_LIBRARIES automatically.

For binaries built using the NDK (LOCAL_SDK_VERSION set), they were
required to use LOCAL_LDLIBS for prebuilt NDK libraries, otherwise they
would get headers and dependencies to the platform versions. Any
non-prebuilt LOCAL_LDLIBS would miss dependencies. So move the NDK
prebuilt libraries to LDLIBS from SHARED_LIBRARIES, and move everything
else to SHARED_LIBRARIES.

So now, for device modules, LOCAL_SHARED_LIBRARIES should always be
used, and we'll do the right thing. LOCAL_LDLIBS should only be used for
host libraries from the system.

Change-Id: Ide34c7afdcfb6507a378d45a42471729e489a9e0
2016-06-07 21:59:55 -07:00
Yabin Cui
72a1156efb Add option to link static lite protobuf library.
Bug: 28114205

Change-Id: Id2b7e42017a53138c60b92de8d196ca92bc38053
2016-06-07 21:24:06 -07:00
Ian Pedowitz
222ab7d2dd Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
2016-06-08 03:09:44 +00:00
Ian Pedowitz
ddc0c5e0a0 Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev 2016-06-08 03:05:40 +00:00
Gustav Sennton
1a37df5ea1 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am: 837b86aa56

* commit '837b86aa5696fea28a0acfde7361a3c5d5824624':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
2016-06-07 16:32:33 +00:00
Gustav Sennton
837b86aa56 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev 2016-06-07 16:21:16 +00:00
Dan Willemsen
32b36a8819 Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901
am: 10461b78f0

* commit '10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
  Add NATIVE_TESTS class, move host native tests

Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
2016-06-07 00:09:39 +00:00
Dan Willemsen
10461b78f0 Merge "Add NATIVE_TESTS class, move host native tests"
am: e72fc63901

* commit 'e72fc639014809b4d4239d7f7754c6950f1ad546':
  Add NATIVE_TESTS class, move host native tests

Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
2016-06-07 00:05:35 +00:00
Dan Willemsen
e72fc63901 Merge "Add NATIVE_TESTS class, move host native tests" 2016-06-06 23:59:23 +00:00
Dan Willemsen
ecf97649bd Merge "Drop CLANG and CLANG_CXX in the environment" am: 27a55cd3c7
am: f03398b651

* commit 'f03398b6519e1d9695c61da450346d5a0f0f8528':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
2016-06-06 21:33:07 +00:00
Dan Willemsen
f03398b651 Merge "Drop CLANG and CLANG_CXX in the environment"
am: 27a55cd3c7

* commit '27a55cd3c703c190f933630e503d963ef7478183':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
2016-06-06 21:27:10 +00:00
Dan Willemsen
6e22c756fc Drop CLANG and CLANG_CXX in the environment
We'll explicitly pass these variables to the static analyzer builds in
binary.mk

Bug: 29071982
Change-Id: Ifc7633d36f5785fe16b63f54b885396c2cab542a
2016-06-06 13:13:50 -07:00
Ian Pedowitz
a87e5f85f2 NYC is 7.0
am: 7a50757731

* commit '7a5075773145704fbc08dbb08bd6e859e04e9859':
  NYC is 7.0

Change-Id: Ia2d810debba042e21e34c340081369bff970db60
2016-06-06 17:13:06 +00:00
Ian Pedowitz
7a50757731 NYC is 7.0
Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06 17:08:18 +00:00
Ian Pedowitz
5fcdec083e Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
2016-06-06 10:06:39 -07:00
Dan Willemsen
b25374cfe1 Merge "Error on external includes" am: 4b33f51043
am: d983b78a6f

* commit 'd983b78a6fac17bbfb26d61f28510476f8edb99a':
  Error on external includes

Change-Id: I82ba6748ea08cb861e3cf4f0fbade2f277433413
2016-06-04 01:13:07 +00:00
Dan Willemsen
d983b78a6f Merge "Error on external includes"
am: 4b33f51043

* commit '4b33f510436f88774f5217b472835973fd8d5b2b':
  Error on external includes

Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
2016-06-04 01:09:52 +00:00
Dan Willemsen
4b33f51043 Merge "Error on external includes" 2016-06-04 01:03:20 +00:00
Vikas Marwaha
404ccc83c4 Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the
new read only product property ro.product.first_api_level.

PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with. We use this variable to set a read-only property that
can be used in CTS/GTS tests.

Change-Id: If54202075d3b92ed380655cde8b3fc50c5ba73b3
2016-06-03 23:02:27 +00:00
Ian Pedowitz
53bf921f72 NYC is now REL
am: f2304ce367

* commit 'f2304ce36778a95793b48fb9ccf83f6b03c19433':
  NYC is now REL

Change-Id: I8d8021b1f9cf89f92b147cb29779b6295a5926d1
2016-06-03 19:26:30 +00:00
Ian Pedowitz
f2304ce367 NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03 09:40:41 -07:00
Gustav Sennton
81ee18670d Add variable PRODUCT_SHIPPING_API_LEVEL.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.

We use this variable to set a read-only property that can be used in
CTS/GTS tests.

Bug: 26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
2016-06-03 09:11:34 +00:00