Commit Graph

27106 Commits

Author SHA1 Message Date
Dan Willemsen c78767f66d Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong"
am: 15409e8f20

* commit '15409e8f20195edce9ccda48836082e4c6bad4f8':
  Remove (C|CPP|CONLY|LD)FLAGS checked by Soong

Change-Id: I412ec02d9825f6f6c857df84744b198e7ce9901a
2016-05-19 22:18:04 +00:00
Dan Willemsen 15409e8f20 Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong" 2016-05-19 22:09:46 +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 e23a49157f Merge "Windows: Stop adding to GLOBAL_LD_DIRS" 2016-05-19 01:09:28 +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
Alex Light c7e74a370a Merge "Add fake libart"
am: 49a4be8130

* commit '49a4be81304d2292bb6bd67ddaabe759d9e8c273':
  Add fake libart

Change-Id: Iacc59ada5b3323c81a8c70464f5634ab722c4f2b
2016-05-18 21:17:09 +00:00
Alex Light 49a4be8130 Merge "Add fake libart" 2016-05-18 21:05:42 +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
Treehugger Robot ac7a7bb0ba Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" 2016-05-18 20:45:19 +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 Light 60c7fd15a8 Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit 6da74d8f1f)
2016-05-18 07:58:05 -07: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
Treehugger Robot 3b0990cbdc Merge "Pass BUILD_HOST_static to Soong" 2016-05-18 00:33:07 +00:00
Dan Willemsen cba1557476 Pass BUILD_HOST_static to Soong
Change-Id: I0ac43a1dedf20e5251e05f12d120d0e6e2e1b1ee
2016-05-17 16:40:03 -07: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 8bbed5a635 Merge "Remove redundant clang cppflags" 2016-05-17 19:46:23 +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 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 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 a794f4db22 Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" 2016-05-17 02:53:50 +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
Alex Klyubin 5e09800c76 Merge "No need to JAR-sign OTA update packages."
am: 094caf99aa

* commit '094caf99aab48c7ef62fd635503a0c70c18ecfde':
  No need to JAR-sign OTA update packages.

Change-Id: I0a0e73cc5f64ba20600c30b9f304b0ff06705693
2016-05-16 17:18:20 +00:00
Alex Klyubin 094caf99aa Merge "No need to JAR-sign OTA update packages." 2016-05-16 17:11:04 +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
Treehugger Robot ea71c96894 Merge "Soong: Read Android.soong.mk if skipping Android.mk" 2016-05-13 23:52:08 +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 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 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 00bccf54d4 Merge "Pass USE_SAFESTACK to Soong." 2016-05-13 22:24:52 +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
Ian Rogers f87e3bb296 Merge "Make Error Prone warnings in sync with Error Prone documenation."
am: 86c3b72d9c

* commit '86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
  Make Error Prone warnings in sync with Error Prone documenation.

Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797
2016-05-13 18:21:57 +00:00
Ian Rogers 86c3b72d9c Merge "Make Error Prone warnings in sync with Error Prone documenation." 2016-05-13 18:19:18 +00:00
Mohamad Ayyash 09bb85af92 Merge "Use fs_config files for mksquashfs"
am: 4730facd73

* commit '4730facd7399ead0d753d7b588001faf6469e041':
  Use fs_config files for mksquashfs

Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
2016-05-13 18:16:05 +00:00
Treehugger Robot 4730facd73 Merge "Use fs_config files for mksquashfs" 2016-05-13 18:13:22 +00:00
Ian Rogers 6e52003b54 Make Error Prone warnings in sync with Error Prone documenation.
Use summary information from annotation within Error Prone to auto-generate
the warnings list.

Bug: 28681096
Change-Id: Ib3a5f734bd229726fcd7332eaa9e0e1bd1200c25
2016-05-13 10:18:18 -07: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 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