Commit Graph

42228 Commits

Author SHA1 Message Date
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
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
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
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 dd888010d3 Merge "AOSP telephony uses device/sample APN XML" am: bd48f84f17
am: e818f98bc0

Change-Id: I90c508b3605c7a92cf0abb5a7a4b6daf21610e77
2018-02-15 18:13:03 +00: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 58a877d853 Merge "emulator: grant fingerprint hal data permission" am: b2cc4ddafd
am: 96fecf5b08

Change-Id: If1bc358d6a761146ec86af0ccf84613b2fff325d
2018-02-15 16:54: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
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 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 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 1acf954411 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
am: eefc171d1f

Change-Id: I9d46343d8bdba4b59eb723cf7015757c95b3bf96
2018-02-14 19:27:55 +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
Adam Seaton 2853edda26 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev am: db07ca24cd am: 73acc9e68a
am: cf071d11f7

Change-Id: I08f5096d9852a62948ffe71b8438b3433f7e9454
2018-02-14 19:07:18 +00:00
Adam Seaton cf071d11f7 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev am: db07ca24cd
am: 73acc9e68a

Change-Id: If83dbff09b778e82911f9f090a88f58bf9a28c6e
2018-02-14 19:02:13 +00:00
Adam Seaton 73acc9e68a Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev
am: db07ca24cd

Change-Id: I738712b5f72e44b3defdb2fecca60c60a77c4433
2018-02-14 18:56:01 +00:00
Colin Cross d7046033f5 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" am: b060ba4b92
am: 4267043041

Change-Id: I9755b011beaf5e0ced2f7a9021854843ce79e0b7
2018-02-14 18:49:28 +00:00
Colin Cross 4267043041 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS"
am: b060ba4b92

Change-Id: If0a1d83a3f452365817684b9ce83c798353f4405
2018-02-14 18:43:42 +00:00
TreeHugger Robot db07ca24cd Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: skipped: c73989b3fc
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: 7dbf8e1467
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped:  skipped: aa694967c6
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped: 01433de204
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
2018-02-14 18:43:37 +00:00
Jiyong Park a8b46cb432 Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" am: 9c339a76c3
am: fb3d065f9a

Change-Id: If8559190f1c0e4b25656bda07fdedfbd5c9b82f8
2018-02-14 18:43:24 +00:00
Jiyong Park fb3d065f9a Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES"
am: 9c339a76c3

Change-Id: Icbc66efce8a32f0db96d17cc601e8de244e7b397
2018-02-14 18:38:01 +00:00
Colin Cross b060ba4b92 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" 2018-02-14 18:36:15 +00:00
Colin Cross 5b73ab34ed Disable duplicates warnings when merging jars
There are too many duplicates warnings, disable them until someone
is actually looking at them.

Bug: 69316739
Test: m checkbuild
Change-Id: Ifb67dbf7734b5f53941d110f578c4fe642e36005
2018-02-14 18:35:37 +00:00
Treehugger Robot 9c339a76c3 Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" 2018-02-14 18:27:08 +00:00
Jiyong Park 889773f7ab BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES
When LOCAL_NO_STANDARD_LIBRARIES is set to true, droiddoc only omits
framework libraries from the required libs. This enables us to use
droiddoc even when frameworks/base is absent (i.e. master-art branch).

Test: m -j core.current.stubs
Test: build in master-art branch
Change-Id: Ia9f0b8bda84b006881b3e62e6573a7784ca56a8c
2018-02-14 21:16:15 +09:00
bowen_lai 70077620c0 Merge "Create symbolic boot vdex files for different ISAs" am: 895a8172ee
am: 862a102804

Change-Id: I17f671838d842a0a3c76c1b39a082b536e0eba60
2018-02-14 01:17:38 +00:00
Christopher Ferris 8ff1ffcc7b Merge "Add libc_malloc_hook to list of libraries." am: 184b4d8560
am: d909c94848

Change-Id: Iafd2976b5cc2d3e29aa31732670dfc9f6a377207
2018-02-14 01:10:05 +00:00
bowen_lai 862a102804 Merge "Create symbolic boot vdex files for different ISAs"
am: 895a8172ee

Change-Id: I226a47f93c3bffee6bf5942f86a983b71bd9367f
2018-02-14 01:05:46 +00:00
Christopher Ferris d909c94848 Merge "Add libc_malloc_hook to list of libraries."
am: 184b4d8560

Change-Id: I7b8303ab179418f86db4946037af044b68caed9b
2018-02-14 01:02:43 +00:00
Treehugger Robot 895a8172ee Merge "Create symbolic boot vdex files for different ISAs" 2018-02-14 00:59:56 +00:00
Jaekyun Seok aabb24c3fc Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631
am: cae2ca8ef5

Change-Id: I9c5d64073d52735ae8f53bb702d6715771359583
2018-02-14 00:59:12 +00:00
Jaekyun Seok cae2ca8ef5 Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products"
am: 42c7cf0631

Change-Id: I7efa870b5649108a2e59b52a682e16e5b8d10420
2018-02-14 00:55:58 +00:00