Commit Graph

42272 Commits

Author SHA1 Message Date
Tao Bao 0fa48c8c52 Merge "releasetools: Add unittest for common.GetSparseImage()." am: 35ee189898
am: 625b5b7a09

Change-Id: I494f253ab122f4098ec1e1fd814c915e618e2aa2
2018-02-20 21:21:31 +00:00
Tao Bao 625b5b7a09 Merge "releasetools: Add unittest for common.GetSparseImage()."
am: 35ee189898

Change-Id: Id9c88438e7753996b699edf8faf6cb50734d810c
2018-02-20 21:14:53 +00:00
Treehugger Robot 35ee189898 Merge "releasetools: Add unittest for common.GetSparseImage()." 2018-02-20 21:04:58 +00:00
Colin Cross 64351dfa66 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" am: fcb10864b7
am: 55219c3bf8

Change-Id: I602d1ce56636e86d607e05a9a400b1f29c8961bf
2018-02-20 20:13:15 +00:00
Colin Cross 55219c3bf8 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"""
am: fcb10864b7

Change-Id: Id01043662b9d0ade1b5c83841350cf8d496a2da0
2018-02-20 20:06:14 +00:00
Treehugger Robot fcb10864b7 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" 2018-02-20 19:50:50 +00:00
Chris Morin e5a0e49daa Merge "have patchoat take directories instead of filenames" am: 6cb3e300fc
am: 8955ffb648

Change-Id: I92b0c75a3cdfec4a0927865635ce92a001f61632
2018-02-20 18:54:10 +00:00
Chris Morin 8955ffb648 Merge "have patchoat take directories instead of filenames"
am: 6cb3e300fc

Change-Id: I630c51c5e80febd46d90ceb1c0b9e58c16746c8c
2018-02-20 18:47:45 +00:00
Treehugger Robot 6cb3e300fc Merge "have patchoat take directories instead of filenames" 2018-02-20 18:30:42 +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 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 aa582f7dda Merge "Add Docker instructions for older branches" am: c6620457d8
am: cfc82c4b33

Change-Id: Ia6404fa198f502ad9be811a83ca19a7fee31bb17
2018-02-17 01:19:32 +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 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
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 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 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
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
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 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
Treehugger Robot 304be2ec74 Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS" 2018-02-16 01:04:45 +00:00
Chih-Hung Hsieh bfc856a64e Merge "Remove core/clang/versions.mk and scan-build wrapper"
am: b9a66a6250

Change-Id: I9072ba68b9bdfc1ba9ad8b0f95a2556d267194f1
2018-02-16 00:57:34 +00:00
Adam Lesinski 6b6283a042 NO_STANDARD_LIBRARIES := true blocks ALL resource libraries
LOCAL_RES_LIBRARIES and LOCAL_APK_LIBRARIES should still be honored.

Test: make CtsDevicePrereleaseSdkApp
Change-Id: I3360d0fe2f7e2f3038e48f41905923a72609ceec
2018-02-15 16:53:18 -08:00
Calin Juravle 55f149263c Record the compilation reson in oat files for prebuilts
Test: build
Bug: 73102540
Change-Id: Ia2ba0670f36b3eeb481bc7b2ae44a1c89777bfc1
2018-02-15 16:00:15 -08:00
Treehugger Robot b9a66a6250 Merge "Remove core/clang/versions.mk and scan-build wrapper" 2018-02-15 23:56:36 +00:00
Andreas Gampe 21a1c6d03f Build: Move LOCAL_ERROR_PRONE_FLAGS
Move application of module flags to host_java_library_common.mk
so that dalvik host builds can also have flags.

Bug: 72451126
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Idbf43afd886536cc7ea674aa4487da3c22987850
2018-02-15 15:02:15 -08:00