Commit Graph

10354 Commits

Author SHA1 Message Date
Dan Willemsen
dcfa920235 Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f
am: 84eb1d2cca

* commit '84eb1d2ccad40ecffa989fe0babf1c4a9c589f0a':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: I4e8de34d50c0ab9e57e2f7c3801b2e1b4d9a981b
2016-05-19 01:26:05 +00:00
Dan Willemsen
84eb1d2cca Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
am: e23a49157f

* commit 'e23a49157f34a3c3f82115a117908d32b14a6262':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: I8b834feed668c311169ec5da294414f47d4175be
2016-05-19 01:23:22 +00:00
Dan Willemsen
174feb906f Remove (C|CPP|CONLY|LD)FLAGS checked by Soong
At the beginning of every build, Soong has exported its version of these
variables, and has been ensuring that when sorted, the result is the
same. So these variables all have the same flags of the Soong ones, but
may be in different orders. We don't believe any of the remaining order
differences matter. As we remove the Make definitions, the exported
Soong variables will take over.

This only removes lines that change one of these variables:

  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_LDFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_LDFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_LDFLAGS

Many other variables are unnecessary now too, but those will be removed
in another change. For those we can ensure the build.ninja file does not
change, but we expect it to change here due to the ordering differences.

Change-Id: I0bd0778706d02ee27b2784dd8dc6b2c71d37bd3a
2016-05-18 18:10:04 -07:00
Dan Willemsen
30296f6b94 Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
am: cb0bccf423

* commit 'cb0bccf42335b4f389e1e3efa2f8681e9b0b2abe':
  Remove trailing newline from TARGET_C_INCLUDES

Change-Id: Ibdaec09f72aa7831a141e1130700840235569d8b
2016-05-19 00:08:00 +00:00
Dan Willemsen
cb0bccf423 Merge "Remove trailing newline from TARGET_C_INCLUDES"
am: 6864e3790c

* commit '6864e3790c80d3044307f0d260cf0e2b962ae82d':
  Remove trailing newline from TARGET_C_INCLUDES

Change-Id: I615050a58cca90291f2c07cae4397a711c69e585
2016-05-19 00:05:26 +00:00
Dan Willemsen
3fe3248c36 Windows: Stop adding to GLOBAL_LD_DIRS
Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.

Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
2016-05-18 16:50:46 -07:00
Dan Willemsen
6864e3790c Merge "Remove trailing newline from TARGET_C_INCLUDES" 2016-05-18 23:50:27 +00:00
Dan Willemsen
5baaba771c Remove trailing newline from TARGET_C_INCLUDES
In preparation for comparing with the Soong variable.

Change-Id: I159507757ed7678a33a3c94e6d01d170485e251a
2016-05-18 15:38:04 -07:00
Dan Willemsen
c7f377721a Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
am: 611211acd4

* commit '611211acd40bc02773d27568d4774d8061149c52':
  Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS

Change-Id: I6744e92b392c02dfcbe2154d13823a5a0a3b7693
2016-05-18 20:55:07 +00:00
Dan Willemsen
611211acd4 Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
am: ac7a7bb0ba

* commit 'ac7a7bb0ba7b864a07ceb159dcd6a8b177866fb3':
  Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS

Change-Id: I7e880084b72d90dc4de16fd674692b53b1e67de2
2016-05-18 20:52:31 +00:00
Dan Willemsen
8308f506ce Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
We never use it for host modules, and all the target configurations use
the same linker argument. This matches Soong.

Change-Id: Ibcba9a4ce340c7a12306d1fee620a04027c0e292
2016-05-18 12:50:53 -07:00
Alex Klyubin
59fcd79e29 Merge "Uncompress native libs only if they are compressed." into nyc-dev
am: 451b72438e

* commit '451b72438e974a10f3f9062ced5d455d3234e4dd':
  Uncompress native libs only if they are compressed.

Change-Id: I4c680cfb228774ce93e75c644e7eee5c40988399
2016-05-18 16:25:46 +00:00
Dan Willemsen
7ec97fdc16 Merge "Remove make variables exported from Soong" am: 30b57cd7d5
am: f85807f794

* commit 'f85807f794266ccebbcba8aaf2732b1fb945519d':
  Remove make variables exported from Soong

Change-Id: I453366e23996f4b68acc5367146829050f00798e
2016-05-18 00:43:02 +00:00
Dan Willemsen
adf18a8836 Merge "Pass BUILD_HOST_static to Soong" am: 3b0990cbdc
am: 700b0f868e

* commit '700b0f868e8200fb5c7c30b35155867606229247':
  Pass BUILD_HOST_static to Soong

Change-Id: I0fddac56a5bf4feb5e5049b96c7d75912eb0d021
2016-05-18 00:43:01 +00:00
Dan Willemsen
f85807f794 Merge "Remove make variables exported from Soong"
am: 30b57cd7d5

* commit '30b57cd7d5459c69fbd4332b988b5e636b529f4d':
  Remove make variables exported from Soong

Change-Id: I2b7a6baf5d8a8b3b0bb52e8fc4b16a5616f8f939
2016-05-18 00:40:31 +00:00
Dan Willemsen
700b0f868e Merge "Pass BUILD_HOST_static to Soong"
am: 3b0990cbdc

* commit '3b0990cbdc941b584fb3000f76607c2a8065b603':
  Pass BUILD_HOST_static to Soong

Change-Id: I8292e35b7ca3fe14133b8675dbf8d6c54736e5aa
2016-05-18 00:40:30 +00:00
Dan Willemsen
30b57cd7d5 Merge "Remove make variables exported from Soong" 2016-05-18 00:36:46 +00:00
Dan Willemsen
cba1557476 Pass BUILD_HOST_static to Soong
Change-Id: I0ac43a1dedf20e5251e05f12d120d0e6e2e1b1ee
2016-05-17 16:40:03 -07:00
Alex Klyubin
587484abe5 Uncompress native libs only if they are compressed.
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.

Bug: 27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
2016-05-17 13:33:34 -07:00
Dan Willemsen
9733cd38a6 Merge "Remove redundant clang cppflags" am: 8bbed5a635
am: 51c38fe13f

* commit '51c38fe13f8812f77a2aa9f76657f10f19ee07de':
  Remove redundant clang cppflags

Change-Id: I49886cb27b60fca17de25f6be193383b40c0c936
2016-05-17 19:54:53 +00:00
Dan Willemsen
51c38fe13f Merge "Remove redundant clang cppflags"
am: 8bbed5a635

* commit '8bbed5a6350a2a7ca1eb7d0886b783fa5b681180':
  Remove redundant clang cppflags

Change-Id: Ic45e02c74ec154bc74b42dd12df2c162b4a862ce
2016-05-17 19:51:27 +00:00
Dan Willemsen
7701eaa5b2 Remove redundant clang cppflags
Cppflags always get added to cflags, so we don't need to duplicate clang
cppflags extras that are already in the clang cflags extras

Change-Id: Ic099f565f20fd993fc0713c033fbc5154373c98f
2016-05-17 00:42:41 -07:00
Shinichiro Hamaji
e855fd6a59 Merge "Make apks depend on their certificates" am: f0a465c2cb
am: f562875d0c

* commit 'f562875d0c232b91be9a0931d30c31b1bbb98c45':
  Make apks depend on their certificates

Change-Id: I28f5f91a6265201136cdf83c18c7ada359bb4d33
2016-05-17 04:08:25 +00:00
Shinichiro Hamaji
f562875d0c Merge "Make apks depend on their certificates"
am: f0a465c2cb

* commit 'f0a465c2cb5921762d7d17d65cd7352d0f64c261':
  Make apks depend on their certificates

Change-Id: I1f89af20d7d4cb337a91203631ff68eb654b0e0c
2016-05-17 04:05:46 +00:00
Shinichiro Hamaji
f0a465c2cb Merge "Make apks depend on their certificates" 2016-05-17 03:58:32 +00:00
Dan Willemsen
4863dafcb1 Remove make variables exported from Soong
These have all been strictly checked by Soong, so the values currently
match. Just remove them so that the make variables exported by Soong
will take over.

This also removes some of the GCC reconfiguration, since we haven't
implemented that in Soong. If it becomes useful in the future, we'll
implement it there.

Some things like TARGET_TOOCHAIN_ROOT can nearly be removed, but are
used before the Soong-exported make_vars.mk is loaded. In that case,
added to the clang cflags, so it can be removed once the cflags are
removed.

Others, like LLVM_PREBUILTS_VERSION are loaded even earlier -- in
envsetup.sh before we've even configured Soong. So for now, keep the
Make definition, and continue ensuring it's the same as the Soong
version.

Change-Id: I554b27062ac43610828a8c06d640d919a2dc21ca
2016-05-16 20:39:58 -07:00
Dan Willemsen
958dc6098e Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" am: a794f4db22
am: 19fdc4428f

* commit '19fdc4428f9036b059a1174a3236eef03180e826':
  Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV

Change-Id: I143bf88ad5031764644dfb2c8b279513c809b50b
2016-05-17 03:05:32 +00:00
Dan Willemsen
19fdc4428f Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
am: a794f4db22

* commit 'a794f4db220d0f357773a037d842f40ab463485f':
  Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV

Change-Id: I7b1fcc43e7c2260632c61e29f0d6bfb41df1b812
2016-05-17 03:03:01 +00:00
Dan Willemsen
db16dd2384 Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.

Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
2016-05-16 17:26:54 -07:00
Alan Viverette
71e10084fd Merge "Add missing support library projects to pathmap" into mnc-ub-dev am: 5b30101722
am: c608284d22

* commit 'c608284d22b95733e6b3a24f84084d9268eeabdf':
  Add missing support library projects to pathmap

Change-Id: I480d62e803903c7421826a8a368c66ac8eef57a8
2016-05-16 15:04:45 +00:00
Alan Viverette
c608284d22 Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am: 5b30101722

* commit '5b3010172211583034d1cf5eac41583dae79d77a':
  Add missing support library projects to pathmap

Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
2016-05-16 15:01:38 +00:00
Dan Willemsen
18a2229bab Merge "Soong: Read Android.soong.mk if skipping Android.mk" am: ea71c96894
am: b8759f4f4b

* commit 'b8759f4f4b060fe9c4dc60fa6d786949b81f4ca0':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: Ibc2622b8292cb33270fe89ee8fcae4cdeb6b60c9
2016-05-13 23:58:48 +00:00
Dan Willemsen
b8759f4f4b Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am: ea71c96894

* commit 'ea71c968943209f41191a1f164f899dd002b9119':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478
2016-05-13 23:56:11 +00:00
Dan Willemsen
5b188fb539 Soong: Read Android.soong.mk if skipping Android.mk
If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.

Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
2016-05-13 16:10:41 -07:00
Colin Cross
9d888e37bb Merge "Default USE_SOONG to true" am: ac33935ac1
am: c33da56ff3

* commit 'c33da56ff30e89f5b09ec02d0b50815b27ab833e':
  Default USE_SOONG to true

Change-Id: Ib795a91a609da4402984c56a493e20dee90ec54f
2016-05-13 22:46:50 +00:00
Colin Cross
c33da56ff3 Merge "Default USE_SOONG to true"
am: ac33935ac1

* commit 'ac33935ac1721c640ce39b722cb7471ea9a5949d':
  Default USE_SOONG to true

Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
2016-05-13 22:44:16 +00:00
Colin Cross
ac33935ac1 Merge "Default USE_SOONG to true" 2016-05-13 22:40:23 +00:00
Dan Willemsen
28ffa853ee Merge "Don\'t use GTEST_OS_LINUX on Darwin" am: 439f4dd189
am: 33b3051784

* commit '33b30517846744adff51579f26a711732caaa338':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Iff14f3c4819c2b604bf0c39b69a45110fcee1fbf
2016-05-13 22:36:22 +00:00
Evgenii Stepanov
80a9d0e20a Merge "Pass USE_SAFESTACK to Soong." am: 00bccf54d4
am: 5bd91e69f7

* commit '5bd91e69f79db2cee14bd18d08f6be7720d6ff5c':
  Pass USE_SAFESTACK to Soong.

Change-Id: I55b7ba71e7efdb401d5466af13895f94a3972020
2016-05-13 22:36:21 +00:00
Dan Willemsen
33b3051784 Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am: 439f4dd189

* commit '439f4dd1895eef8684b3257fe5631a45d51635d6':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
2016-05-13 22:33:48 +00:00
Evgenii Stepanov
5bd91e69f7 Merge "Pass USE_SAFESTACK to Soong."
am: 00bccf54d4

* commit '00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
  Pass USE_SAFESTACK to Soong.

Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
2016-05-13 22:33:47 +00:00
Dan Willemsen
439f4dd189 Merge "Don't use GTEST_OS_LINUX on Darwin" 2016-05-13 22:29:16 +00:00
Evgenii Stepanov
7f13ab998a Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
2016-05-13 14:40:58 -07:00
Dan Willemsen
66fced615f Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
2016-05-13 21:10:50 +00:00
Alan Viverette
e5368fa373 Add documents-archive to SDK, docs builds
Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472
2016-05-13 14:17:33 -04:00
Alan Viverette
55e80ef5c4 Add missing support library projects to pathmap
Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
2016-05-13 14:15:25 -04:00
Shinichiro Hamaji
641e61cb53 Make apks depend on their certificates
Bug: 27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 16:03:24 +09:00
Shinichiro Hamaji
4ed2ff913b resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp
Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
2016-05-13 14:33:34 +09:00
Shinichiro Hamaji
505f1eaaa9 Merge "Follow symlinks when using find for assets"
am: 4c4c06016b

* commit '4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
  Follow symlinks when using find for assets

Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
2016-05-13 05:24:35 +00:00
Shinichiro Hamaji
4c4c06016b Merge "Follow symlinks when using find for assets" 2016-05-13 05:20:05 +00:00