Przemyslaw Szczepaniak
929db472be
Revert "Remove org.apache.http.legacy from bootclasspath"
...
This reverts commit 58b793771c
.
Reason for revert: b/73762903
Change-Id: I2faa22d47278d436baa6d7994f0bad879ac7265b
Exempt-From-Owner-Approval: Revert
2018-02-22 16:07:53 +00:00
Przemyslaw Szczepaniak
58b793771c
Remove org.apache.http.legacy from bootclasspath
...
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
Change-Id: I6a6d35198c49ed8a0b370fbe4a94320aefc4d7c3
2018-02-21 18:04:28 +00:00
Elliott Hughes
05ae8ed76b
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e
am: be692347f5
...
am: 8375aa9168
Change-Id: I051cabcc401ae92352767afa27a3b490a23247a1
2018-02-20 15:52:15 +00:00
Elliott Hughes
8375aa9168
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e
...
am: be692347f5
Change-Id: I836342c819bfb0dd5360c9e833859923d1f54e40
2018-02-20 15:44:11 +00:00
Elliott Hughes
be692347f5
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too."
...
am: 1d7d1eb65e
Change-Id: Ifa1bd8a71ea1ecc060f49993533d4348b92d364d
2018-02-20 15:37:07 +00:00
Elliott Hughes
1d7d1eb65e
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too."
2018-02-20 15:27:54 +00:00
Dan Willemsen
b5ab2c7828
Merge "Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))""
2018-02-19 22:51:11 +00:00
Dan Willemsen
a350b67ec4
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06
am: 1964dbc6ad
...
am: 6bd3e1f31c
Change-Id: Ib9b3d96487017f7cc05b97f5879efbfeefec94ca
2018-02-17 04:19:27 +00:00
Dan Willemsen
6bd3e1f31c
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06
...
am: 1964dbc6ad
Change-Id: I6c73171efc7e741338bea0bd9cc2632be93a10e6
2018-02-17 04:10:02 +00:00
Dan Willemsen
1964dbc6ad
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"""
...
am: 5fdae96b06
Change-Id: I25ffe5d7c864ba0edd30f7a0696178e66df6234f
2018-02-17 04:02:24 +00:00
Treehugger Robot
5fdae96b06
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"""
2018-02-17 03:15:58 +00:00
Dan Willemsen
dcdc1685c7
Merge "Add Docker instructions for older branches" am: c6620457d8
am: cfc82c4b33
...
am: aa582f7dda
Change-Id: I84b2706e169ecb4835cd1dd8193576a6001e750a
2018-02-17 01:27:40 +00:00
Dan Willemsen
aa582f7dda
Merge "Add Docker instructions for older branches" am: c6620457d8
...
am: cfc82c4b33
Change-Id: Ia6404fa198f502ad9be811a83ca19a7fee31bb17
2018-02-17 01:19:32 +00:00
Dan Shi
e2a2481619
Merge "build: Default test modules to null-suite" am: b6655e0e1a
am: f2f7c7d6f6
...
am: 4125716024
Change-Id: I529300c539b16e72e65885b72c80fa076ec11ff2
2018-02-17 01:12:30 +00:00
Elliott Hughes
adf7ef8eb9
Use the platform -std= for LOCAL_SDK_VERSION targets too.
...
Bug: http://b/72571399
Test: builds
Change-Id: Ifd06798a7c9af9fd316201d88b724a53bcf0bcd9
2018-02-16 17:12:21 -08:00
Dan Willemsen
cfc82c4b33
Merge "Add Docker instructions for older branches"
...
am: c6620457d8
Change-Id: Idef0d5b914778b2198ced4a0af40f21fa1c76f4e
2018-02-17 01:11:25 +00:00
Dan Shi
4125716024
Merge "build: Default test modules to null-suite" am: b6655e0e1a
...
am: f2f7c7d6f6
Change-Id: I065476483b5cdb87908bd7ac46f2b1da3d501c12
2018-02-17 01:03:45 +00:00
Treehugger Robot
c6620457d8
Merge "Add Docker instructions for older branches"
2018-02-17 00:59:17 +00:00
Dan Shi
f2f7c7d6f6
Merge "build: Default test modules to null-suite"
...
am: b6655e0e1a
Change-Id: I0de87e2097146c9c56e8d34a5418a0e86b05c20b
2018-02-17 00:55:04 +00:00
Dan Shi
b6655e0e1a
Merge "build: Default test modules to null-suite"
2018-02-17 00:39:27 +00:00
Dan Willemsen
ed767bc62a
Merge "Support core_current when exporting resources from a package" am: 64006ad4f3
am: 44cca0767e
...
am: c15e211a1c
Change-Id: I768268624b00cb42cefa5b0043133119e591e70d
2018-02-17 00:14:35 +00:00
Mathieu Chartier
91055f89db
Merge "Add a product property for changing the default compiler filter" am: 60431c098e
am: d66be15c96
...
am: 18f0f94b01
Change-Id: I6c7eac17b86ea26d9cae2f2f525c25f3847168e8
2018-02-17 00:13:55 +00:00
Dan Willemsen
c15e211a1c
Merge "Support core_current when exporting resources from a package" am: 64006ad4f3
...
am: 44cca0767e
Change-Id: I3fb400c2567abf6d4f2c618a9786a59a29f2a8d2
2018-02-17 00:05:22 +00:00
Mathieu Chartier
18f0f94b01
Merge "Add a product property for changing the default compiler filter" am: 60431c098e
...
am: d66be15c96
Change-Id: I7f0dcc976665f882cb032b64eb582c3ed4831bed
2018-02-17 00:04:46 +00:00
Dan Willemsen
44cca0767e
Merge "Support core_current when exporting resources from a package"
...
am: 64006ad4f3
Change-Id: I4929cbf235d0154ddab68c6fbd5d0cf29719c2f1
2018-02-16 23:57:08 +00:00
Mathieu Chartier
d66be15c96
Merge "Add a product property for changing the default compiler filter"
...
am: 60431c098e
Change-Id: I32c7c75aa2721aad3363e159b81dc364a50d41ba
2018-02-16 23:56:39 +00:00
Treehugger Robot
64006ad4f3
Merge "Support core_current when exporting resources from a package"
2018-02-16 23:41:26 +00:00
Mathieu Chartier
60431c098e
Merge "Add a product property for changing the default compiler filter"
2018-02-16 23:41:21 +00:00
TreeHugger Robot
7c9bbd37cd
Merge "Allow projects to define their own globally-available variables"
2018-02-16 22:29:02 +00:00
Dan Willemsen
c51b7b0d55
Support core_current when exporting resources from a package
...
Bug: 73351844
Test: with https://googleplex-android-review.git.corp.google.com/c/platform/cts/+/3621794
Change-Id: I20b8adf0d7cb5d948ba752e0732bbe84d39a419a
2018-02-16 13:32:26 -08:00
Colin Cross
b351b6ebde
Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5
am: 0d68c850f7
...
am: 4b03c695d6
Change-Id: Ife94343139c513f5e80c87d8dbcd88587f99f2e3
2018-02-16 20:25:09 +00:00
Colin Cross
4b03c695d6
Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5
...
am: 0d68c850f7
Change-Id: I2792a15a40f3d51a3d6a5a446e45071dd0970e9a
2018-02-16 20:17:07 +00:00
Colin Cross
0d68c850f7
Merge "Partially revert BUILD_DATETIME change"
...
am: f5a87046c5
Change-Id: I490fc1d892771307587d439eb2e83907baaa9eda
2018-02-16 20:08:27 +00:00
Colin Cross
f5a87046c5
Merge "Partially revert BUILD_DATETIME change"
2018-02-16 19:55:37 +00:00
Colin Cross
ce8c05196d
Partially revert BUILD_DATETIME change
...
Change Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901 caused kati to
regenerate on every build:
$(shell cat out/build_date.txt) was changed, regenerating...
Switch back to $(shell date +%s) which is special cased in kati
to not cause a regeneration. Everything besides DATE will still
use BUILD_DATETIME_FROM_FILE from soong_ui.
Once BUILD_NUMBER is moved to soong_ui $(DATE) is no longer
necessary and the whole thing can be removed.
Bug: 70351683
Bug: 73352417
Test: m && m doesn't regenerate
Test: m BUILD_DATETIME=1234 shows up in ro.build.version.incremental
Change-Id: I8444beb2b47a49095ef760083fc85f220821bffe
2018-02-16 09:41:24 -08:00
Adam Lesinski
d02d0723c4
Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" am: dc6e822374
am: 02a9374e93
...
am: fffec91ad7
Change-Id: Idfb7446a8038bf246c5620f7da1dad030fb66b94
2018-02-16 04:00:55 +00:00
Adam Lesinski
fffec91ad7
Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" am: dc6e822374
...
am: 02a9374e93
Change-Id: Icb4275ed1c3e6bb87a913025ca8ee1afd9046662
2018-02-16 03:52:48 +00:00
Adam Lesinski
02a9374e93
Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries"
...
am: dc6e822374
Change-Id: I7bd7c56e4d1c6d0b43729c772b61ef8f8da77be9
2018-02-16 03:46:13 +00:00
Calin Juravle
9aaf050c76
Merge "Record the compilation reson in oat files for prebuilts" am: 87774191b3
am: 1697a9b6f0
...
am: 92fc421d24
Change-Id: I339f1df6878d5f16916b59816ff812f5d2b34653
2018-02-16 03:40:43 +00:00
Treehugger Robot
dc6e822374
Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries"
2018-02-16 03:35:28 +00:00
Calin Juravle
92fc421d24
Merge "Record the compilation reson in oat files for prebuilts" am: 87774191b3
...
am: 1697a9b6f0
Change-Id: Id4f91219fd5f3778bc32210f16ba9278fdd42388
2018-02-16 03:27:05 +00:00
Calin Juravle
1697a9b6f0
Merge "Record the compilation reson in oat files for prebuilts"
...
am: 87774191b3
Change-Id: I64aa5a5ec80982ea485b49edcdb066ae5eb2e2c1
2018-02-16 03:12:44 +00:00
Treehugger Robot
87774191b3
Merge "Record the compilation reson in oat files for prebuilts"
2018-02-16 02:28:31 +00:00
Dan Willemsen
6dc4621afc
Add Docker instructions for older branches
...
If you've upgraded away from Ubuntu 14.04 Trusty, you may find that
older branches (or certain code) doesn't build anymore. These
instructions can form a starting point to build these older branches
within Docker.
Bug: 72993575
Test: Follow instructions, build marshmallow-dev
Test: Follow instructions, build lollipop-mr1-dev
Change-Id: If4047b1bb5324d75a9d0947cb5280ff1cabccb6a
2018-02-15 18:17:46 -08:00
Andreas Gampe
b24f0a1071
Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS" am: 304be2ec74
am: 024e08192e
...
am: 9b54ee8bf3
Change-Id: I1382d90ffb4f8fc4f91c09a80139ed9c47a8638b
2018-02-16 01:44:58 +00:00
Mathieu Chartier
e8fb7cf87b
Add a product property for changing the default compiler filter
...
Add product property for changing default compiler filter:
PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER
Bug: 70934104
Test: Specify PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER in a device.mk
Change-Id: I264631fc3813ef44d43b802b4cd9a8e92098183e
2018-02-15 17:44:37 -08:00
Andreas Gampe
9b54ee8bf3
Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS" am: 304be2ec74
...
am: 024e08192e
Change-Id: I0f416bcecebbb0364345a4025dd8b3fef8617e28
2018-02-16 01:31:20 +00:00
Andreas Gampe
024e08192e
Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS"
...
am: 304be2ec74
Change-Id: I2b2fc2526670faae72a821b0b480ac5fe45ef744
2018-02-16 01:17:36 +00:00
Chih-Hung Hsieh
acc684b07d
Merge "Remove core/clang/versions.mk and scan-build wrapper" am: b9a66a6250
am: bfc856a64e
...
am: 7f3bea5982
Change-Id: I5946a803690d77243721b342d5b35a87728a6111
2018-02-16 01:11:14 +00:00
Chih-Hung Hsieh
7f3bea5982
Merge "Remove core/clang/versions.mk and scan-build wrapper" am: b9a66a6250
...
am: bfc856a64e
Change-Id: Ia2c17b54af6966565db2de49db61499ce48b9aa2
2018-02-16 01:04:46 +00:00