Commit Graph

41545 Commits

Author SHA1 Message Date
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 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 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 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 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
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
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 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 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 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 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 024e08192e Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS"
am: 304be2ec74

Change-Id: I2b2fc2526670faae72a821b0b480ac5fe45ef744
2018-02-16 01:17:36 +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
Nan Zhang 03bca8c4a8 Merge "Remove BUILD_DATETIME from Make."
am: 4babe39d0f

Change-Id: I80fb427641584deddc8bce4975aa3965a431705f
2018-02-15 22:46:31 +00:00
Treehugger Robot 4babe39d0f Merge "Remove BUILD_DATETIME from Make." 2018-02-15 22:30:49 +00:00
Chih-Hung Hsieh 7ed0db8d1d Remove core/clang/versions.mk and scan-build wrapper
* Use the definitions of ClangDefaultBase and ClangDefaultVersion
  in build/soong/cc/config/global.go.
* scan-build is too old;
  replaced by better clang-tidy's -clang-analyzer-* checks.
* WITH_STATIC_ANALYZER is still effective
  to invoke ccc-analyzer or c++-analyzer.

Test: make checkbuild
Change-Id: Ifd159dd28e529d5d3c9807f5e391911365da8cdb
2018-02-15 13:38:50 -08:00
Meng Wang e818f98bc0 Merge "AOSP telephony uses device/sample APN XML"
am: bd48f84f17

Change-Id: If122321d98cb3cc2c86946cd028febf4cbac0687
2018-02-15 18:06:40 +00:00
Meng Wang bd48f84f17 Merge "AOSP telephony uses device/sample APN XML" 2018-02-15 17:37:57 +00:00
bohu 96fecf5b08 Merge "emulator: grant fingerprint hal data permission"
am: b2cc4ddafd

Change-Id: I89cbaaf66d1c765ac2d9794ec1e6ad7fa44fc578
2018-02-15 16:47:23 +00:00
Treehugger Robot b2cc4ddafd Merge "emulator: grant fingerprint hal data permission" 2018-02-15 16:34:36 +00:00
Meng Wang 5151c6c2b8 AOSP telephony uses device/sample APN XML
Bug: 73091197
Test: make - /system/etc/apns-conf.xml same as
      device/sample/etc/apns-full-conf.xml

Change-Id: I5e9651066e7a5d4de31d846daf3fe3120476b89f
2018-02-15 05:54:52 +00:00
bohu 72fa12db3c emulator: grant fingerprint hal data permission
Test: build sdk_gphone_x86-userdebug
launch emulator, enroll fingerprint, close emulator
relaunch emulator, check previously enrolled fingerprint still work

Change-Id: I27552509368f08cc6a7aa52b0e9efc5ae952469d
2018-02-14 15:37:31 -08:00
Tao Bao fc7e0e06b6 releasetools: Add unittest for common.GetSparseImage().
Add construct_sparse_image() to test_utils.py, which is a util function
to create sparse images. The new tests also partially cover the recent
changes that add 'incomplete' and 'uses_shard_blocks' tags.

Test: python -m unittest test_common
Change-Id: Ia15f5c4ad12423691216ebbad2c28f95c8427d7e
2018-02-14 15:12:52 -08:00
Nan Zhang 975f41ed34 Remove BUILD_DATETIME from Make.
Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
2018-02-14 13:30:53 -08:00
Colin Cross 87eba4a9ba Merge "Disable duplicates warnings when merging jars"
am: 2a519d5a9b

Change-Id: I3d450f1bfb0833c8a86729a331f209dc2e59a795
2018-02-14 21:11:15 +00:00
Treehugger Robot 2a519d5a9b Merge "Disable duplicates warnings when merging jars" 2018-02-14 20:52:30 +00:00
Colin Cross 1acf954411 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
am: eefc171d1f

Change-Id: I9d46343d8bdba4b59eb723cf7015757c95b3bf96
2018-02-14 19:27:55 +00:00