Nan Zhang
b335c4a4f3
Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8
...
am: 7edfe29e8f
Change-Id: I1ef8af667a806ead8c4098bbdab12d377e8fd7b1
2018-02-22 23:11:08 +00:00
Treehugger Robot
5d7ec6bdf8
Merge "Export Make config vars to Soong to support Droiddoc"
2018-02-22 22:11:07 +00:00
hansson
1f903cce0c
Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668
...
am: ab8f5d74f2
Change-Id: I46e339b3faf05092e01950ca702f11d647667d02
2018-02-22 11:53:50 +00:00
hansson
3c76d02668
Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS."
2018-02-22 11:33:57 +00:00
Nan Zhang
7e634580ba
Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
...
am: 90b8d087e6
Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
2018-02-22 02:29:18 +00:00
Treehugger Robot
d3bec931cd
Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make."
2018-02-22 02:07:15 +00:00
Mathieu Chartier
a6355cbc9b
Merge "Add property for generating dm files" am: 3d2b45ad55
...
am: d8cb5746be
Change-Id: I6cee03620521d4846a23a6a65e413c484ad7ada3
2018-02-22 01:42:33 +00:00
Nan Zhang
0abdb5811d
Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
...
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.
Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Mathieu Chartier
5c658ac3a9
Add property for generating dm files
...
Added product property: PRODUCT_DEX_PREOPT_GENERATE_DM_FILES.
If this property is true, APKs compiled as verify will have the dex
files left compressed and the vdex put in a dm file. The vdex file
and oat files are not copied to system partition in this case.
Bug: 70934104
Test: manual
Change-Id: Ie137e14f14642b803a506162de6db8ac65a43f46
2018-02-21 13:50:21 -08:00
Anton Hansson
7ff32d2734
Add support for LOCAL_PRIVATE_PLATFORM_APIS.
...
The only enforcement right now is that modules don't specify both
LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning
can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable.
Bug: 73535841
Test: make w/ and wo/ flag.
Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 18:10:59 +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
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
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
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
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 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
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
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
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
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
Treehugger Robot
87774191b3
Merge "Record the compilation reson in oat files for prebuilts"
2018-02-16 02:28:31 +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
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
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
Nan Zhang
cf9d50302a
Export Make config vars to Soong to support Droiddoc
...
export Android.mk config vars to Soong, and export stubs.jar to Make
after compiling Droiddoc from Soong.
Bug: b/70351683
Test: Convert libcore docs Android.mk to Soong manually.
Change-Id: I749b4b3e1e50abce8a757130987c18d7135a3859
2018-02-15 16:10:21 -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
649f5b3c9a
Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f
...
am: 03bca8c4a8
Change-Id: I3f8e13a53dbd3217f3ae15b9512d3bb917695df1
2018-02-15 22:53:02 +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
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
51b559abfa
Merge "Disable duplicates warnings when merging jars" am: 2a519d5a9b
...
am: 87eba4a9ba
Change-Id: Ibdb4a36ff11824d5712a2f6744e0463b35f809a4
2018-02-14 21:16:25 +00:00
Colin Cross
dc8086745d
Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" am: eefc171d1f
...
am: 1acf954411
Change-Id: Ia19752d48e23ab246eecb7be692273a2661a9805
2018-02-14 19:34:13 +00:00
Colin Cross
484a712453
Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
...
This reverts commit 6bd8e28571
.
Change-Id: I486be40cd76b504bd8641cebd91248fe93f2e5a0
2018-02-14 19:25:24 +00:00
Colin Cross
eefc171d1f
Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
2018-02-14 19:14:17 +00:00
Colin Cross
6bd8e28571
Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"
...
This reverts commit 86a596c711
.
Reason for revert: Broke aosp_x86_64-eng checkbuild
Change-Id: Ib13b967ee56efdf3053ef1a292a07c1b82972588
2018-02-14 19:13:04 +00:00