Tao Bao
183e47ef1a
Merge "Don't build retrofit OTA package if vendor.img is unavailable." am: 9f1eda65e6
am: 831fd23482
...
am: c3a4322c20
Change-Id: I69525f569e7c1c2753f1f7006ab599a3532a7eed
2019-01-07 17:18:23 -08:00
Tao Bao
c3a4322c20
Merge "Don't build retrofit OTA package if vendor.img is unavailable." am: 9f1eda65e6
...
am: 831fd23482
Change-Id: I3a45c14559c8579b580d8e9a53907a49897544f3
2019-01-07 17:07:56 -08:00
Tao Bao
831fd23482
Merge "Don't build retrofit OTA package if vendor.img is unavailable."
...
am: 9f1eda65e6
Change-Id: I2034a3ad8b43cd7b846043de7f5c9a890f1550dd
2019-01-07 16:59:34 -08:00
Tao Bao
9f1eda65e6
Merge "Don't build retrofit OTA package if vendor.img is unavailable."
2019-01-07 23:49:23 +00:00
Alex Light
0dc66f65c6
Merge "Save invocation info of dex2oat runs." am: 4ab7bb3ee8
am: 6b1a13481c
...
am: ece6814452
Change-Id: I782243d17b5ecc80101c1010997b411f090421e7
2019-01-07 14:06:13 -08:00
Alex Light
ece6814452
Merge "Save invocation info of dex2oat runs." am: 4ab7bb3ee8
...
am: 6b1a13481c
Change-Id: I0367210bfa4fb74a9a230c47a617bd5d3412b29d
2019-01-07 13:57:43 -08:00
Alex Light
6b1a13481c
Merge "Save invocation info of dex2oat runs."
...
am: 4ab7bb3ee8
Change-Id: If83aedead9f1898297337ba17a45b79f42253f2c
2019-01-07 13:49:17 -08:00
Treehugger Robot
4ab7bb3ee8
Merge "Save invocation info of dex2oat runs."
2019-01-07 21:38:16 +00:00
Ahmed ElArabawy
3df654e8c4
Merge "Wifi: Add Wifi library to mainline_system"
2019-01-07 20:25:57 +00:00
Tao Bao
519d18286e
Don't build retrofit OTA package if vendor.img is unavailable.
...
We used to build retrofit full OTA package as long as
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS is true. This doesn't work with AOSP
targets that have the flag set but without any available vendor image.
This CL detects such a condition and uses a separate flag to guard the
retrofit OTA building as well as the split super images generation.
Bug: 120852744
Test: `m -j dist` on blueline (w/ vendor images) and aosp_blueline (w/o
vendor images).
Change-Id: I65726f24f8fc546be6802941a6a06590a3804c16
2019-01-07 12:22:48 -08:00
Alex Buynytskyy
295e7a07a4
Merge "Making abb part of system image." am: 0d5fcc075e
am: 0c6519c536
...
am: ef0e17bb50
Change-Id: Ifa174011b576492ba0ac6a4fd301685ccfa7277a
2019-01-07 12:15:31 -08:00
Alex Buynytskyy
ef0e17bb50
Merge "Making abb part of system image." am: 0d5fcc075e
...
am: 0c6519c536
Change-Id: I1c4922fe252da3d9599960cd6c156e2e81fe6195
2019-01-07 12:09:19 -08:00
Alex Buynytskyy
0c6519c536
Merge "Making abb part of system image."
...
am: 0d5fcc075e
Change-Id: I3299f5de71899d7f506d35ac56fb262d8fd3652c
2019-01-07 11:50:43 -08:00
Treehugger Robot
0d5fcc075e
Merge "Making abb part of system image."
2019-01-07 19:34:32 +00:00
Yifan Hong
2595a1a7c1
Merge "Allow devices launched with DAP to override super partition name." am: b3f5918890
am: b5bd352159
...
am: 14ebc65941
Change-Id: I0a9f40c09ec1da455e3c15654f9abe9d4ae6d8e5
2019-01-07 10:56:49 -08:00
Yifan Hong
14ebc65941
Merge "Allow devices launched with DAP to override super partition name." am: b3f5918890
...
am: b5bd352159
Change-Id: Ic1851f6e7592223da0035f38c5f7b2a9d9694c5a
2019-01-07 10:47:27 -08:00
Yifan Hong
b5bd352159
Merge "Allow devices launched with DAP to override super partition name."
...
am: b3f5918890
Change-Id: I54aac68d6b65e4dd1e5b854c8f63d15e87687f10
2019-01-07 10:39:06 -08:00
Yifan Hong
b3f5918890
Merge "Allow devices launched with DAP to override super partition name."
2019-01-07 18:26:17 +00:00
Dan Willemsen
7dd69f1b3a
Merge "Remove more Android.mk files from build/make" am: ebe0b7a1c9
am: 2c99074cbe
...
am: b877b02724
Change-Id: I0540e99bfee84e2336ac454765f0295139711f38
2019-01-07 10:00:01 -08:00
Dan Willemsen
b877b02724
Merge "Remove more Android.mk files from build/make" am: ebe0b7a1c9
...
am: 2c99074cbe
Change-Id: I5af0dde7533eecb64dd68cf9003434b4eb5d8a40
2019-01-07 09:54:57 -08:00
Dan Willemsen
2c99074cbe
Merge "Remove more Android.mk files from build/make"
...
am: ebe0b7a1c9
Change-Id: I4ae44447a096fe191e03fb6e793d4d62dbabb736
2019-01-07 09:49:41 -08:00
Treehugger Robot
ebe0b7a1c9
Merge "Remove more Android.mk files from build/make"
2019-01-07 17:44:20 +00:00
Ahmed ElArabawy
b38ce5a6ff
Wifi: Add Wifi library to mainline_system
...
This commit adds android.hardware.wifi@1.0.so to mainline_system.
Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
2019-01-07 08:57:06 -08:00
Mathew Inwood
9748fa8975
[automerger skipped] Merge "Fix hiddenapi-greylist.csv generation." am: 575402b967
am: 21239db6f4
...
am: f3d09d68d6
-s ours
am skip reason: change_id Ib48042ecca320c4d7c3a27959e41e5c55099b27a with SHA1 8626c8ea95
is in history
Change-Id: I9d8d4cd8e1d4e8308fd1d9488d290e727d57460e
2019-01-07 08:44:28 -08:00
Mathew Inwood
f3d09d68d6
Merge "Fix hiddenapi-greylist.csv generation." am: 575402b967
...
am: 21239db6f4
Change-Id: Ied5fae3581a7232c32bf96ba2705dd6d9b27cea2
2019-01-07 08:40:25 -08:00
Mathew Inwood
21239db6f4
Merge "Fix hiddenapi-greylist.csv generation."
...
am: 575402b967
Change-Id: Iea26c3a288504d7793a4ecccfc47c7f62fccf37a
2019-01-07 08:36:06 -08:00
Treehugger Robot
575402b967
Merge "Fix hiddenapi-greylist.csv generation."
2019-01-07 16:28:31 +00:00
Nicolas Geoffray
bb35597c0d
Merge "Update OWNERS for dex preopt related files." am: c3efc773aa
am: 6d24dc89e4
...
am: 90ff8e2a89
Change-Id: I2b8b52652e8d53bf85a74fda8d7155bf2a9f50ca
2019-01-07 07:50:38 -08:00
Nicolas Geoffray
90ff8e2a89
Merge "Update OWNERS for dex preopt related files." am: c3efc773aa
...
am: 6d24dc89e4
Change-Id: I2eff69c24880a26ef52095e5fb06cfe368bd9731
2019-01-07 07:46:28 -08:00
Alex Buynytskyy
8a96a65bc7
Making abb part of system image.
...
Test: manual
Change-Id: Id8921e0afa0d1f94d439f4a35d71bb017ed6f765
2019-01-07 15:45:21 +00:00
Nicolas Geoffray
6d24dc89e4
Merge "Update OWNERS for dex preopt related files."
...
am: c3efc773aa
Change-Id: I9d46d3cdaaf645af12beee51775c2a495707f781
2019-01-07 07:41:17 -08:00
Treehugger Robot
c3efc773aa
Merge "Update OWNERS for dex preopt related files."
2019-01-07 15:28:43 +00:00
Mathew Inwood
0fa280036b
Fix hiddenapi-greylist.csv generation.
...
It was referring to a non-existant macro paramater resulting in empty
output.
Test: m out/target/common/obj/PACKAGING/hiddenapi-greylist.csv
& then check output.
(cherry picked from commit 8626c8ea95
)
Change-Id: Ib48042ecca320c4d7c3a27959e41e5c55099b27a
Merged-In: Ib48042ecca320c4d7c3a27959e41e5c55099b27a
2019-01-07 14:59:51 +00:00
Anton Hansson
7bd6935ba3
Merge "Add a languages_default.mk" am: 14fc7361b9
am: a8345dff8a
...
am: 987412cb00
Change-Id: I25cc2a0b07061cfdf78a4dd7cadc80012c6f5a57
2019-01-07 03:00:46 -08:00
Anton Hansson
0fc8fd99a8
Merge "Remove km_MH locale from mainline" am: 47ca8d0a73
am: 49cd6c9c0e
...
am: 885f6c1081
Change-Id: I5049fb12135e8e37a19732b2779e40639e6edf69
2019-01-07 02:59:48 -08:00
Anton Hansson
987412cb00
Merge "Add a languages_default.mk" am: 14fc7361b9
...
am: a8345dff8a
Change-Id: Ic6e1a5139d2f03576b58bdcbdc58742d2c6ab28b
2019-01-07 02:54:16 -08:00
Anton Hansson
885f6c1081
Merge "Remove km_MH locale from mainline" am: 47ca8d0a73
...
am: 49cd6c9c0e
Change-Id: I27f800c9f95224763d7f68edcfcc9c5caf2fa61a
2019-01-07 02:53:32 -08:00
Anton Hansson
a8345dff8a
Merge "Add a languages_default.mk"
...
am: 14fc7361b9
Change-Id: I2f79f28ff9047d1fee8358e2fde425a147e63bb2
2019-01-07 02:46:56 -08:00
Anton Hansson
49cd6c9c0e
Merge "Remove km_MH locale from mainline"
...
am: 47ca8d0a73
Change-Id: Idf1258fdf7f70927c5ccdc194577140d3b7435b3
2019-01-07 02:46:21 -08:00
Anton Hansson
14fc7361b9
Merge "Add a languages_default.mk"
2019-01-07 10:32:25 +00:00
Anton Hansson
47ca8d0a73
Merge "Remove km_MH locale from mainline"
2019-01-07 10:31:52 +00:00
Tor Norbye
58027e26aa
Merge "Switch apicheck over from doclava to metalava" am: 5ca77c512c
am: 52c520096b
...
am: 30905d6ef7
Change-Id: I4e3187cf8980ada64e7b65eb34a14b8fa2abd675
2019-01-06 08:34:26 -08:00
Tor Norbye
30905d6ef7
Merge "Switch apicheck over from doclava to metalava" am: 5ca77c512c
...
am: 52c520096b
Change-Id: I0cece2d7bafe47a5b4987bb374d2554339d4de1e
2019-01-06 08:26:07 -08:00
Tor Norbye
52c520096b
Merge "Switch apicheck over from doclava to metalava"
...
am: 5ca77c512c
Change-Id: I48965e4921aa46ef88182420e3b5395064b355fb
2019-01-06 08:13:57 -08:00
Tor Norbye
5ca77c512c
Merge "Switch apicheck over from doclava to metalava"
2019-01-06 16:04:33 +00:00
Tor Norbye
b6ae80df15
Merge "Revert "Add user customized fonts to handheld system.""
2019-01-05 23:48:29 +00:00
Tor Norbye
98073de607
Revert "Add user customized fonts to handheld system."
...
This reverts commit d0b532aaf4
.
Reason for revert: likely cause for broken build 5211430 and later
Change-Id: I3c4fef262a5d387eebf8eba23f8e30abcea6c450
2019-01-05 20:46:33 +00:00
Dan Willemsen
ef45381221
Remove more Android.mk files from build/make
...
soong_ui is passing the Android.mk file list to Kati, and it ignores
Android.mk files found via symlinks, so we don't need the workarounds
for build/make/target/board/Android.mk and build/target/board/Android.mk
both existing.
We've got dist support in Soong now, so we can remove the signapk
Android.mk
Bug: 122332221
Test: m dist out/dist/signapk.jar out/dist/libconscrypt_openjdk_jni.so
Change-Id: I2ac9016b04146340c5ac80f7090d00e186023574
2019-01-05 02:40:45 +00:00
TreeHugger Robot
0dffa14776
Merge "Add user customized fonts to handheld system."
2019-01-05 02:33:34 +00:00
Hridya Valsaraju
7dbacc000b
Merge "Increase slack for inode estimation algorithm" am: dacde2259f
am: e5af443000
...
am: be281179d4
Change-Id: Ibd8d354b327c07e9a4d17171430f78417bf4cb0d
2019-01-04 17:47:29 -08:00