Commit graph

29430 commits

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

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

Change-Id: I9e63f52a421f9a4358887fdb76c055b51d7903ea
2016-05-19 22:20:34 +00:00
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
Alan Viverette
88c45e1415 Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am: 88b0d6a63d

* commit '88b0d6a63d8149d14032d298eccde79a6d3079d4':
  Add documents-archive to SDK, docs builds

Change-Id: I2c07f2f20da849174d23dfe6ab5c81008c37c6b1
2016-05-19 19:48:49 +00:00
Alan Viverette
88b0d6a63d Merge "Add documents-archive to SDK, docs builds" into nyc-dev 2016-05-19 19:39:11 +00:00
Baligh Uddin
37cbef1b1c DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43 -s ours
am: 3c42a21466

* commit '3c42a2146612209e7b8eab749cbafe7f0782e942':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: I173d5494f192dc907ae5e6db1e6318bfe66b38c4
2016-05-19 16:56:20 +00:00
Baligh Uddin
3c42a21466 DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb
am: 9606ea8a43  -s ours

* commit '9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
2016-05-19 16:52:12 +00:00
Baligh Uddin
9606ea8a43 DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb

* commit 'cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
2016-05-19 16:47:58 +00:00
Baligh Uddin
cea440c2eb DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am: 74da4d6eef

* commit '74da4d6eef1da6490729dfbd069adf913d9aa6fa':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
2016-05-19 16:43:34 +00:00
Baligh Uddin
74da4d6eef DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.

Bug: 23967152
2016-05-19 08:50:19 -07:00
Andreas Gampe
28efcb6d39 Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

* commit '695b28f67c88b87486911f8881078e7857e989a8':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
2016-05-19 05:10:55 +00:00
Andreas Gampe
695b28f67c Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.

Bug: 28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
2016-05-18 20:10:43 -07:00
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
e23a49157f Merge "Windows: Stop adding to GLOBAL_LD_DIRS" 2016-05-19 01:09:28 +00: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
Alex Light
8354ee5e9d Merge "Add fake libart" am: 49a4be8130
am: c7e74a370a

* commit 'c7e74a370aaf3fa6c31e6552b90f6e95fe217d06':
  Add fake libart

Change-Id: I320a4d810a611b59410330ce1c48936d63158705
2016-05-18 21:20:40 +00: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
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
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 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
TreeHugger Robot
451b72438e Merge "Uncompress native libs only if they are compressed." into nyc-dev 2016-05-18 16:17:18 +00: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
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
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
Stefan De Clercq
e8cd88216b Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea -s ours
am: 9497f830a2

* commit '9497f830a25f90ed63b06a2f2636a9c99edd9979':
  Add SDK 10 and 11 to list of supported Mac SDKs

Change-Id: Ia7c8b3244047cd7072feb9027608651d46ba07b4
2016-05-17 20:56:59 +00:00
Stefan De Clercq
9497f830a2 Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
am: 2937ec60ea  -s ours

* commit '2937ec60ea64b5e1e821b40a227542b1d95b5bb4':
  Add SDK 10 and 11 to list of supported Mac SDKs

Change-Id: I9dfc020e3f9083a02fc831b86294af0f26891526
2016-05-17 20:53:09 +00: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
Stefan De Clercq
2937ec60ea Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev 2016-05-17 20:09:02 +00: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
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
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