Commit Graph

10686 Commits

Author SHA1 Message Date
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
Chih-Hung Hsieh
fbde37d8b9 Merge "Default to enable tidy warnings in header files." am: 6a7cf55a7d
am: b764f7d0d6

* commit 'b764f7d0d662f7fd9d797ca796a85972596023d6':
  Default to enable tidy warnings in header files.

Change-Id: Ied47b955b1e0d11a1711c1d76c7ef90e6394ef5a
2016-06-02 23:29:55 +00:00
Chih-Hung Hsieh
b764f7d0d6 Merge "Default to enable tidy warnings in header files."
am: 6a7cf55a7d

* commit '6a7cf55a7dfe844b4df173520890b4daee60ea63':
  Default to enable tidy warnings in header files.

Change-Id: Ib4ca529f2f81d05db8392a4f501bea3400f17d57
2016-06-02 23:27:17 +00:00
Treehugger Robot
6a7cf55a7d Merge "Default to enable tidy warnings in header files." 2016-06-02 23:18:00 +00:00
Tao Bao
97b55bc7a5 Merge "Add support for TARGET_RECOVERY_BRICK." am: daf55776be
am: 88df5bee3a

* commit '88df5bee3addaacddd32adf7f78fd5fe1493c38a':
  Add support for TARGET_RECOVERY_BRICK.

Change-Id: I90717df1ee18cadb89bec8afa5280b3ebf434a13
2016-06-02 22:56:43 +00:00
Tao Bao
88df5bee3a Merge "Add support for TARGET_RECOVERY_BRICK."
am: daf55776be

* commit 'daf55776beefeb3f59d2f7ca61796ad07fa1d738':
  Add support for TARGET_RECOVERY_BRICK.

Change-Id: I70a4682caca250d557975dcf19bfbf63bc567a24
2016-06-02 22:54:25 +00:00
Treehugger Robot
daf55776be Merge "Add support for TARGET_RECOVERY_BRICK." 2016-06-02 22:44:56 +00:00
Chih-Hung Hsieh
870f087867 Default to enable tidy warnings in header files.
Change-Id: I3831f03facbbd6d17117d82f9ccac49bc2645237
2016-06-02 15:20:05 -07:00
Tao Bao
a062c7e62d Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.

Bug: 27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
(cherry picked from commit 3051f4f11a)
2016-06-02 14:46:53 -07:00
Daniel Micay
888a623881 disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-01 17:01:18 -07:00
Dan Willemsen
d99f210545 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am: 476b5b1616
am: 58b7c1c744

* commit '58b7c1c744aa49fb0686848b281ae75c2485f420':
  Add LOCAL_LOGTAGS_FILES that prebuilts can use

Change-Id: I76a6077c3945463a5b52fb8a4f5146a2590de716
2016-06-01 23:53:44 +00:00
Jeffrey Vander Stoep
3728ebcfaf Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98
am: 13f2b4cf2f

* commit '13f2b4cf2f9ec4e17bedf75b01263b88d08982d6':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
2016-06-01 23:53:42 +00:00
Dan Willemsen
58b7c1c744 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
am: 476b5b1616

* commit '476b5b161613cc352961414b549a0553361d533b':
  Add LOCAL_LOGTAGS_FILES that prebuilts can use

Change-Id: Ib0b5bb5aac8b2d1c9896d58bb2c7928a63de4241
2016-06-01 23:47:18 +00:00
Daniel Micay
13f2b4cf2f Merge "disable unpriv perf by default in user{,debug} builds"
am: 4bc8280a98

* commit '4bc8280a9886d93870fab02eea73986d8ca08965':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Icb4e1ad8ec0bd491a99b541ac98dc95bf509aa63
2016-06-01 23:47:15 +00:00
Treehugger Robot
476b5b1616 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" 2016-06-01 23:28:10 +00:00
Jeffrey Vander Stoep
4bc8280a98 Merge "disable unpriv perf by default in user{,debug} builds" 2016-06-01 23:18:46 +00:00
Dan Willemsen
b0a08b874c Add LOCAL_LOGTAGS_FILES that prebuilts can use
Soong modules can define logtags files that need to be combined into
/system/etc/event-log-tags, so add a new LOCAL_LOGTAGS_FILES variable
that can be used to specify *.logtags file outside of LOCAL_SRC_FILES.

Bug: 28989759
Change-Id: I53c5d396dfb7c6006806758f351eb5cdde90fe74
2016-06-01 15:31:44 -07:00
Colin Cross
2a73e9280b Merge "Update default NINJA_STATUS to show finished edges" am: 27032630c0
am: 91fbe6006a

* commit '91fbe6006a1422611e7ec2956d641c18b62f1f4f':
  Update default NINJA_STATUS to show finished edges

Change-Id: Iaf65cd8a7fcccdb7e4f06a6708788161885c0dc5
2016-06-01 05:05:34 +00:00
Colin Cross
01437aa5d3 Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053
am: 18023b557b

* commit '18023b557b6d33836de380df397fce10598931a9':
  Update Android.mk finder to work with Android.bp files

Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
2016-06-01 05:05:33 +00:00
Colin Cross
91fbe6006a Merge "Update default NINJA_STATUS to show finished edges"
am: 27032630c0

* commit '27032630c0683c30fa78a7bf9432c5b651707f7b':
  Update default NINJA_STATUS to show finished edges

Change-Id: I8e9989722cc5855640a0fcd68597926ce7f0dfda
2016-06-01 05:01:30 +00:00
Colin Cross
18023b557b Merge "Update Android.mk finder to work with Android.bp files"
am: 520442f053

* commit '520442f0537c72276147e86116a1170ea1ddc9d7':
  Update Android.mk finder to work with Android.bp files

Change-Id: Ic737bc2d3e693dc7398fff665f7557c3e2e2a72b
2016-06-01 05:01:28 +00:00
Colin Cross
27032630c0 Merge "Update default NINJA_STATUS to show finished edges" 2016-06-01 04:52:59 +00:00
Colin Cross
520442f053 Merge "Update Android.mk finder to work with Android.bp files" 2016-06-01 04:52:47 +00:00
Dan Willemsen
6532011f9f Merge "Add Soong tools to PATH" am: b09e644e1d
am: 28874dc0c1

* commit '28874dc0c1c790005672406ea50729579096d6f4':
  Add Soong tools to PATH

Change-Id: I5a8f9a27a651c1c79469e53daa1cc34a6febbbc8
2016-06-01 02:49:05 +00:00
Dan Willemsen
28874dc0c1 Merge "Add Soong tools to PATH"
am: b09e644e1d

* commit 'b09e644e1db3439d85ce6dd9e371ac6514a4343c':
  Add Soong tools to PATH

Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
2016-06-01 02:45:03 +00:00
Dan Willemsen
60d9c673d7 Add Soong tools to PATH
Change-Id: I8f8649106df4ba7cefbfa37a724ebe0635d90b76
2016-05-31 18:32:35 -07:00
Dan Willemsen
6a55b1c681 Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8
am: 99e2c216b4

* commit '99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
2016-05-31 22:23:11 +00:00