Dan Willemsen
0af09cfa3d
Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
am: cb0bccf423
...
am: 30296f6b94
* commit '30296f6b9432b3fff26544ec6a4c03592c372030':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I25b1f83a179792608c34323c1d776cd37fbfd806
2016-05-19 00:16:11 +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
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
Tao Bao
5b195bf082
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
...
am: dd24d65d2f
* commit 'dd24d65d2fb563d30db175ada8230978e81ba27f':
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
Change-Id: Ib9f4de25f04147dffd2ae67e35125706a8132a78
2016-05-18 22:09:42 +00:00
Tao Bao
dd24d65d2f
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
2016-05-18 21:59:48 +00:00
Alex Light
1313e5416a
Merge "Add fake libart" am: 49a4be8130
am: c7e74a370a
...
am: 8354ee5e9d
* commit '8354ee5e9d6ac7b61da04c47ce8483167f17f44d':
Add fake libart
Change-Id: Idb6a2b6c2960895f7f509bfae24f23091312f270
2016-05-18 21:22:27 +00: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
6a08107d2a
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
am: 611211acd4
...
am: c7f377721a
* commit 'c7f377721a3804bb80f27a75ec95a7644d406e4b':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I8917b7238f15eb1610dca4ec4a900fcde378d5f8
2016-05-18 20:57:41 +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
Tao Bao
295ad1f1f1
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
...
This reverts commit 439971af5d
.
Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
2016-05-18 12:22:33 -07:00
Android Build Merger (Role)
550fc85425
Merge "Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e
am: 59fcd79e29" into nyc-mr1-dev-plus-aosp
2016-05-18 16:28:34 +00:00
Alex Klyubin
b86cf69d0e
Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e
...
am: 59fcd79e29
* commit '59fcd79e29e9418b02f6ba3fbbbd3e2e45eb3785':
Uncompress native libs only if they are compressed.
Change-Id: I1164c2e43eaf3c0d2d66887174ebf2eda70d5c2a
2016-05-18 16:28:21 +00:00
Alex Klyubin
0ef2d2f6c9
Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e
...
am: eea3802b2c
* commit 'eea3802b2c3e9a244a6e84fdfcdb7955bbe2ad2b':
Uncompress native libs only if they are compressed.
Change-Id: I7ccabcd02062d8e355779c6eac893d87d8f108c6
2016-05-18 16:28:20 +00:00
Alex Klyubin
eea3802b2c
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: I9b4f21468db91955b021c744e83efba8b126dc0e
2016-05-18 16:25:46 +00: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
3e1e237986
Merge "Remove make variables exported from Soong" am: 30b57cd7d5
am: f85807f794
...
am: 7ec97fdc16
* commit '7ec97fdc1627c48ab7bb161f273aaeba33c850d1':
Remove make variables exported from Soong
Change-Id: I5007f9293791657245b4ddc38cff691487f43b52
2016-05-18 00:45:35 +00:00
Dan Willemsen
e0cb1eeeb7
Merge "Pass BUILD_HOST_static to Soong" am: 3b0990cbdc
am: 700b0f868e
...
am: adf18a8836
* commit 'adf18a8836b596829435b3f3ec6a47674894faa9':
Pass BUILD_HOST_static to Soong
Change-Id: If8bce1964ec29b7094a824ce8901fec49abcdda0
2016-05-18 00:45:34 +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
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
Android Build Merger (Role)
a49249df8b
Merge "Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea
-s ours am: 9497f830a2
am: 0125118f84" into nyc-mr1-dev-plus-aosp
2016-05-17 21:01:04 +00:00
Stefan De Clercq
2167381cf0
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea
-s ours am: 9497f830a2
...
am: e8cd88216b
* commit 'e8cd88216bbc246970e345b849a292d35052f170':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: I139b5002e27f57e8f7c133bda80ae88baa7d2e0d
2016-05-17 21:00:51 +00:00
Stefan De Clercq
0afdb959ce
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea
-s ours am: 9497f830a2
...
am: 0125118f84
* commit '0125118f84dcffe3dae56d5a86dc86a20f488de4':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: I7fa532ff7e8899e7f3056097913f2b0ed8974630
2016-05-17 21:00:51 +00:00
Stefan De Clercq
0125118f84
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: Ic907b685fe84abca5d7dcf836747a3120fcf5ab0
2016-05-17 20:57:00 +00: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
e1aa342c4e
Merge "Remove redundant clang cppflags" am: 8bbed5a635
am: 51c38fe13f
...
am: 9733cd38a6
* commit '9733cd38a6135a5f87e6a4cecfd0d38d700d69be':
Remove redundant clang cppflags
Change-Id: Ice5cc54cf0d3d328ad6135950fff5b9225c462fc
2016-05-17 19:57:59 +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
486ee6bb7d
Merge "Make apks depend on their certificates" am: f0a465c2cb
am: f562875d0c
...
am: e855fd6a59
* commit 'e855fd6a59e66c83e152dd128adc2a49254ca289':
Make apks depend on their certificates
Change-Id: Ie5dd09ebe8d5d2b8f7be36db176b293c96ddd594
2016-05-17 04:10:44 +00: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